summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-06-18 18:24:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 21:13:09 (GMT)
commit0aad8f3f608683e2760cfc3afc8a3c8f05e4ef15 (patch)
tree797cd929f16c14cc6132fdabd05d56fe71377d3f /meta/recipes-qt
parentd827764c70a626ac064496f0e0d55ddcabc66254 (diff)
downloadpoky-0aad8f3f608683e2760cfc3afc8a3c8f05e4ef15.tar.gz
qt4-tools-nativesdk: fix compile failure in src/dbus
[Qt #17962] -- http://bugreports.qt.nokia.com/browse/QTBUG-17962 [YOCTO #1168] -- http://bugzilla.pokylinux.org/show_bug.cgi?id=1168 Fix "invalid conversion from 'const void*' to 'void*'" error compiling src/dbus/qdbusintegrator.cpp. It is assumed that the use of "const" here is incorrect as no other usage of Q_GLOBAL_STATIC_WITH_ARGS uses const prefix on the first (TYPE) argument. Patch was imported from the Qt bug tracker (see above reference); the patch was rejected but for procedural rather than validity reasons. Fixes [YOCTO #1168] (From OE-Core rev: 17d5422460bf9074223475b15d128171d12b170a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/qt-dbus-const.patch21
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc1
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch
new file mode 100644
index 0000000..a856912
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch
@@ -0,0 +1,21 @@
1Remove "const" usage that causes compile failure building qt4-tools-nativesdk
2
3Patch has apparently been rejected upstream, not because it is invalid
4but because the submitter did not submit a merge request for it, so the
5validity of the patch upstream is uncertain. For further details see:
6http://bugreports.qt.nokia.com/browse/QTBUG-17962
7
8Original Author: Pavel Heimlich <tropikhajma at gmail.com>
9Upstream-Status: Rejected
10
11--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
12+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
13@@ -71,7 +71,7 @@
14 static bool isDebugging;
15 #define qDBusDebug if (!::isDebugging); else qDebug
16
17-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
18+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
19
20 static inline QString dbusServiceString()
21 { return *orgFreedesktopDBusString(); }
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 114f998..19da0ce 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -17,6 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
17 file://qt-config.patch \ 17 file://qt-config.patch \
18 file://qmake-exists-check.patch \ 18 file://qmake-exists-check.patch \
19 file://configure-paths.patch \ 19 file://configure-paths.patch \
20 file://qt-dbus-const.patch \
20 file://g++.conf \ 21 file://g++.conf \
21 file://linux.conf" 22 file://linux.conf"
22 23