Pull in an upstream commit to fix the build with the upcoming Qt 5.5.1.

Contrary to what the upstream commit message says, this is also required on
FreeBSD 10.
This commit is contained in:
Raphael Kubo da Costa 2016-01-21 13:01:55 +00:00
parent 06be62fdcc
commit 3de0aabbd6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=406853

View File

@ -0,0 +1,29 @@
From 9c21825332543189ca7083171c7aff9f1e3aff06 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Wed, 28 Oct 2015 13:55:55 -0400
Subject: [PATCH] Add a couple "const" declarations to the PC-BSD utilities
keyboard settings classes. This is apparently needed for 11.x compilation.
---
src-qt5/libpcbsd/utils/keyboardsettings.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- libpcbsd/utils/keyboardsettings.h
+++ libpcbsd/utils/keyboardsettings.h
@@ -41,7 +41,7 @@ namespace keyboard
SLayout(){;}
SLayout(QString layout, QString variant):layout_id(layout),variant_id(variant){;}
- bool operator==(const SLayout& l)
+ bool operator==(const SLayout& l) const
{
return (layout_id == l.layout_id) && (variant_id == l.variant_id);
}
@@ -80,7 +80,7 @@ namespace keyboard
group_name = fullName.split(":")[0];
option = fullName.split(":")[1];
}
- bool operator==(const SOption& opt)
+ bool operator==(const SOption& opt) const
{
return ((group_name == opt.group_name)&&(option == opt.option));
}