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>
This commit is contained in:
Paul Eggleton 2011-06-18 19:24:07 +01:00 committed by Richard Purdie
parent d827764c70
commit 0aad8f3f60
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,21 @@
Remove "const" usage that causes compile failure building qt4-tools-nativesdk
Patch has apparently been rejected upstream, not because it is invalid
but because the submitter did not submit a merge request for it, so the
validity of the patch upstream is uncertain. For further details see:
http://bugreports.qt.nokia.com/browse/QTBUG-17962
Original Author: Pavel Heimlich <tropikhajma at gmail.com>
Upstream-Status: Rejected
--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
@@ -71,7 +71,7 @@
static bool isDebugging;
#define qDBusDebug if (!::isDebugging); else qDebug
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
static inline QString dbusServiceString()
{ return *orgFreedesktopDBusString(); }

View File

@ -17,6 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://qt-config.patch \
file://qmake-exists-check.patch \
file://configure-paths.patch \
file://qt-dbus-const.patch \
file://g++.conf \
file://linux.conf"