diff options
Diffstat (limited to 'meta/recipes-qt/qt4/files')
| -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 000000000..a85691260 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch @@ -0,0 +1,21 @@ +Remove "const" usage that causes compile failure building qt4-tools-nativesdk + +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: +http://bugreports.qt.nokia.com/browse/QTBUG-17962 + +Original Author: Pavel Heimlich <tropikhajma at gmail.com> +Upstream-Status: Rejected + +--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 ++++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 +@@ -71,7 +71,7 @@ + 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(); } |