summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-09-09 06:28:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:53:00 +0100
commit01416520c37f219e3c3f4abfd6f69a5563325568 (patch)
tree8dcf63610e8aa557fba3162594322ae16e58680f /meta
parent6b73a05338b66c1cbb8bc8e87dee22f5d0a420de (diff)
downloadpoky-01416520c37f219e3c3f4abfd6f69a5563325568.tar.gz
qt4: Fix kmap2qmap build with clang
Adapted and backported https://codereview.qt-project.org/#/c/107464/ Fixes errors like ../../include/QtCore/../../src/corelib/tools/qalgorithms.h:161:20: error: call to function 'operator<' that is neither visible in the template definition nor found by argument-dependent lookup return (t1 < t2); (From OE-Core rev: db87b70b6422cea860b5ad688015e4b668ff605d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index 10f87a79d5..d165514bf9 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -24,6 +24,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
24 file://0030-aarch64_arm64_qatomic_support.patch \ 24 file://0030-aarch64_arm64_qatomic_support.patch \
25 file://0031-aarch64_arm64_mkspecs.patch \ 25 file://0031-aarch64_arm64_mkspecs.patch \
26 file://0032-aarch64_add_header.patch \ 26 file://0032-aarch64_add_header.patch \
27 file://0034-Fix-kmap2qmap-build-with-clang.patch \
27 file://Fix-QWSLock-invalid-argument-logs.patch \ 28 file://Fix-QWSLock-invalid-argument-logs.patch \
28 file://add_check_for_aarch64_32.patch \ 29 file://add_check_for_aarch64_32.patch \
29 file://g++.conf \ 30 file://g++.conf \
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
new file mode 100644
index 0000000000..f47a1d9c3e
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
@@ -0,0 +1,34 @@
1From: Samuel Gaist <samuel.gaist@edeltech.ch>
2Date: Wed, 4 Mar 2015 20:16:50 +0000 (+0100)
3Subject: Fix kmap2qmap build on OS X
4X-Git-Tag: v5.4.2~6
5X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqttools.git;a=commitdiff_plain;h=cf196a2565235f649b88fac55b53270bea23458d;hp=3070815a24239bd0f469bfeb8d0a1f091974e28e
6
7Fix kmap2qmap build on OS X
8
9Currently kmap2qmap fails to build on OS X (clang) This patch aims to
10fix this.
11
12Change-Id: I61c985dc7ad1f2486368c39aa976599d274942ab
13Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
14---
15Upstream-Status: Backport
16Index: qt-everywhere-opensource-src-4.8.7/tools/kmap2qmap/main.cpp
17===================================================================
18--- qt-everywhere-opensource-src-4.8.7.orig/tools/kmap2qmap/main.cpp
19+++ qt-everywhere-opensource-src-4.8.7/tools/kmap2qmap/main.cpp
20@@ -385,9 +385,11 @@ static const int symbol_synonyms_size =
21
22 // makes the generated array in --header mode a bit more human readable
23 QT_BEGIN_NAMESPACE
24-static bool operator<(const QWSKeyboard::Mapping &m1, const QWSKeyboard::Mapping &m2)
25-{
26- return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
27+namespace QWSKeyboard {
28+ static bool operator<(const Mapping &m1, const Mapping &m2)
29+ {
30+ return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
31+ }
32 }
33 QT_END_NAMESPACE
34