From 17d5422460bf9074223475b15d128171d12b170a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 18 Jun 2011 19:24:07 +0100 Subject: 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 --- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-qt/qt4/qt4-tools-nativesdk.inc') diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 114f998bb..19da0cec3 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" -- cgit v1.2.3