0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334
  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. Patch has apparently been rejected upstream, not because it is invalid
  7. but because the submitter did not submit a merge request for it, so the
  8. validity of the patch upstream is uncertain. For further details see:
  9. https://bugreports.qt-project.org/browse/QTBUG-17962
  10. Upstream-Status: Denied [possible retry]
  11. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  12. ---
  13. src/dbus/qdbusintegrator.cpp | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
  16. index 0f0b647..aa4cbab 100644
  17. --- a/src/dbus/qdbusintegrator.cpp
  18. +++ b/src/dbus/qdbusintegrator.cpp
  19. @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
  20. static bool isDebugging;
  21. #define qDBusDebug if (!::isDebugging); else qDebug
  22. -Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
  23. +Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
  24. static inline QString dbusServiceString()
  25. { return *orgFreedesktopDBusString(); }
  26. --
  27. 1.8.0