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