diff options
author | Ross Burton <ross.burton@intel.com> | 2012-11-19 14:22:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:47 +0000 |
commit | 1f71583dacaf2abde4930815b3415c3af104f514 (patch) | |
tree | 205b617c5ad55675e2a050ace6c933e29d30ecf2 /meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch | |
parent | 4e2de8f749103a54d51f627e75401b70bb41d47c (diff) | |
download | poky-1f71583dacaf2abde4930815b3415c3af104f514.tar.gz |
qt4: remove 4.8.1
(From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a)
Signed-off-by: Ross Burton <ross.burton@intel.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-.patch | 34 |
1 files changed, 0 insertions, 34 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 deleted file mode 100644 index 010575828e..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pavel Heimlich <tropikhajma@gmail.com> | ||
3 | Date: Wed, 26 Sep 2012 20:31:10 +0200 | ||
4 | Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure | ||
5 | building nativesdk-qt4-tools | ||
6 | |||
7 | Patch has apparently been rejected upstream, not because it is invalid | ||
8 | but because the submitter did not submit a merge request for it, so the | ||
9 | validity of the patch upstream is uncertain. For further details see: | ||
10 | http://bugreports.qt.nokia.com/browse/QTBUG-17962 | ||
11 | |||
12 | Upstream-Status: Denied [possible retry] | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | --- | ||
16 | src/dbus/qdbusintegrator.cpp | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp | ||
20 | index 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 | -- | ||
33 | 1.7.12 | ||
34 | |||