diff options
Diffstat (limited to 'meta/recipes-qt/qt4/files/qt-dbus-const.patch')
-rw-r--r-- | meta/recipes-qt/qt4/files/qt-dbus-const.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch new file mode 100644 index 0000000000..a856912604 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Remove "const" usage that causes compile failure building qt4-tools-nativesdk | ||
2 | |||
3 | Patch has apparently been rejected upstream, not because it is invalid | ||
4 | but because the submitter did not submit a merge request for it, so the | ||
5 | validity of the patch upstream is uncertain. For further details see: | ||
6 | http://bugreports.qt.nokia.com/browse/QTBUG-17962 | ||
7 | |||
8 | Original Author: Pavel Heimlich <tropikhajma at gmail.com> | ||
9 | Upstream-Status: Rejected | ||
10 | |||
11 | --- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 | ||
12 | +++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 | ||
13 | @@ -71,7 +71,7 @@ | ||
14 | static bool isDebugging; | ||
15 | #define qDBusDebug if (!::isDebugging); else qDebug | ||
16 | |||
17 | -Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) | ||
18 | +Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) | ||
19 | |||
20 | static inline QString dbusServiceString() | ||
21 | { return *orgFreedesktopDBusString(); } | ||