From aea363afaa193feee774dad30d81c516ea4a98fc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Sep 2012 21:00:04 +0200 Subject: qt4: replace all local patches with git patches with headers * in preparation for upgrade to 4.8.3 (From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- ...-const-usage-that-causes-compile-failure-.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch') diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch new file mode 100644 index 0000000000..010575828e --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch @@ -0,0 +1,34 @@ +From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001 +From: Pavel Heimlich +Date: Wed, 26 Sep 2012 20:31:10 +0200 +Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure + building nativesdk-qt4-tools + +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 + +Upstream-Status: Denied [possible retry] + +Signed-off-by: Martin Jansa +--- + src/dbus/qdbusintegrator.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp +index 5d97a8e..5014b8b 100644 +--- a/src/dbus/qdbusintegrator.cpp ++++ b/src/dbus/qdbusintegrator.cpp +@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE + 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(); } +-- +1.7.12 + -- cgit v1.2.3-54-g00ecf