sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Khem Raj 2015-09-09 06:28:49 +00:00 committed by Richard Purdie
parent 6b73a05338
commit 01416520c3
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-qt/qt4/qt4-4.8.7.inc
View File

@ -24,6 +24,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://0030-aarch64_arm64_qatomic_support.patch \
file://0031-aarch64_arm64_mkspecs.patch \
file://0032-aarch64_add_header.patch \
file://0034-Fix-kmap2qmap-build-with-clang.patch \
file://Fix-QWSLock-invalid-argument-logs.patch \
file://add_check_for_aarch64_32.patch \
file://g++.conf \

34
meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch Normal file
View File

@ -0,0 +1,34 @@
From: Samuel Gaist <samuel.gaist@edeltech.ch>
Date: Wed, 4 Mar 2015 20:16:50 +0000 (+0100)
Subject: Fix kmap2qmap build on OS X
X-Git-Tag: v5.4.2~6
X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqttools.git;a=commitdiff_plain;h=cf196a2565235f649b88fac55b53270bea23458d;hp=3070815a24239bd0f469bfeb8d0a1f091974e28e
Fix kmap2qmap build on OS X
Currently kmap2qmap fails to build on OS X (clang) This patch aims to
fix this.
Change-Id: I61c985dc7ad1f2486368c39aa976599d274942ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
Upstream-Status: Backport
Index: qt-everywhere-opensource-src-4.8.7/tools/kmap2qmap/main.cpp
===================================================================
--- qt-everywhere-opensource-src-4.8.7.orig/tools/kmap2qmap/main.cpp
+++ qt-everywhere-opensource-src-4.8.7/tools/kmap2qmap/main.cpp
@@ -385,9 +385,11 @@ static const int symbol_synonyms_size =
// makes the generated array in --header mode a bit more human readable
QT_BEGIN_NAMESPACE
-static bool operator<(const QWSKeyboard::Mapping &m1, const QWSKeyboard::Mapping &m2)
-{
- return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
+namespace QWSKeyboard {
+ static bool operator<(const Mapping &m1, const Mapping &m2)
+ {
+ return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
+ }
}
QT_END_NAMESPACE