summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-27 15:48:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:14 +0000
commit8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch)
tree9b93d0fcd8fd973943ca61f126cae47066113922 /meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
parent0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff)
downloadpoky-8b11ed8a75a15328bbd22d100a976cc669b84b58.tar.gz
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy. Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with meta-qt3 and meta-qt5. (From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch34
1 files changed, 0 insertions, 34 deletions
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
deleted file mode 100644
index f47a1d9c3e..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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