summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 21:00:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:28 +0100
commitaea363afaa193feee774dad30d81c516ea4a98fc (patch)
tree00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
parent425df23c02b7dad3c843ec9959a51337ab450cd1 (diff)
downloadpoky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz
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 <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch34
1 files changed, 34 insertions, 0 deletions
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 @@
1From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001
2From: Pavel Heimlich <tropikhajma@gmail.com>
3Date: Wed, 26 Sep 2012 20:31:10 +0200
4Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure
5 building nativesdk-qt4-tools
6
7Patch has apparently been rejected upstream, not because it is invalid
8but because the submitter did not submit a merge request for it, so the
9validity of the patch upstream is uncertain. For further details see:
10http://bugreports.qt.nokia.com/browse/QTBUG-17962
11
12Upstream-Status: Denied [possible retry]
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/dbus/qdbusintegrator.cpp | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
20index 5d97a8e..5014b8b 100644
21--- a/src/dbus/qdbusintegrator.cpp
22+++ b/src/dbus/qdbusintegrator.cpp
23@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
24 static bool isDebugging;
25 #define qDBusDebug if (!::isDebugging); else qDebug
26
27-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
28+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
29
30 static inline QString dbusServiceString()
31 { return *orgFreedesktopDBusString(); }
32--
331.7.12
34