35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
|
|
From: Pavel Heimlich <tropikhajma@gmail.com>
|
|
Date: Wed, 26 Sep 2012 20:31:10 +0200
|
|
Subject: [PATCH 07/21] 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:
|
|
https://bugreports.qt-project.org/browse/QTBUG-17962
|
|
|
|
Upstream-Status: Denied [possible retry]
|
|
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
---
|
|
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 0f0b647..aa4cbab 100644
|
|
--- a/src/dbus/qdbusintegrator.cpp
|
|
+++ b/src/dbus/qdbusintegrator.cpp
|
|
@@ -73,7 +73,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.8.0
|
|
|