summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:13:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:27 +0100
commitb0862a5cf2ba2878e7fefa5193acae3a82ea46fd (patch)
tree2281286b22e424616e1889a6077fcd6d5415dbec /meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
parentee14710dbf1c4383ca20851529684f164883cc80 (diff)
downloadpoky-b0862a5cf2ba2878e7fefa5193acae3a82ea46fd.tar.gz
qt4: move patches from files to qt4-4.8.1
* faster lookup in FILESPATH as small bonus (From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
new file mode 100644
index 0000000000..6ee402fdc1
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
@@ -0,0 +1,22 @@
1Remove "const" usage that causes compile failure building nativesdk-qt4-tools
2
3Upstream-Status: Denied [possible retry]
4
5Patch has apparently been rejected upstream, not because it is invalid
6but because the submitter did not submit a merge request for it, so the
7validity of the patch upstream is uncertain. For further details see:
8http://bugreports.qt.nokia.com/browse/QTBUG-17962
9
10Original Author: Pavel Heimlich <tropikhajma at gmail.com>
11
12--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
13+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
14@@ -71,7 +71,7 @@
15 static bool isDebugging;
16 #define qDBusDebug if (!::isDebugging); else qDebug
17
18-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
19+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
20
21 static inline QString dbusServiceString()
22 { return *orgFreedesktopDBusString(); }