Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | From 2011bb8029480af1d1266f258e5a5f5cef7392d3 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/21] 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 | https://bugreports.qt-project.org/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 0f0b647..aa4cbab 100644 |
| 21 | --- a/src/dbus/qdbusintegrator.cpp |
| 22 | +++ b/src/dbus/qdbusintegrator.cpp |
| 23 | @@ -73,7 +73,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.8.0 |
| 34 | |