diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-18 19:24:07 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-22 17:41:39 +0100 |
| commit | 17d5422460bf9074223475b15d128171d12b170a (patch) | |
| tree | 88b02674d76a3f1db3d0fb7d583bcb7f6303c9d7 /meta/recipes-qt | |
| parent | bc5647504268ec4ef8a20dd1a6f9bdf7e6849ba7 (diff) | |
| download | openembedded-core-17d5422460bf9074223475b15d128171d12b170a.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]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/files/qt-dbus-const.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 1 |
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 0000000000..a856912604 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch @@ -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(); } diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 114f998bb1..19da0cec37 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}. file://qt-config.patch \ file://qmake-exists-check.patch \ file://configure-paths.patch \ + file://qt-dbus-const.patch \ file://g++.conf \ file://linux.conf" |