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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch index a856912604..f3de77e3e6 100644 --- a/meta/recipes-qt/qt4/files/qt-dbus-const.patch +++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch | |||
| @@ -1,12 +1,13 @@ | |||
| 1 | Remove "const" usage that causes compile failure building qt4-tools-nativesdk | 1 | Remove "const" usage that causes compile failure building qt4-tools-nativesdk |
| 2 | 2 | ||
| 3 | Upstream-Status: Denied [possible retry] | ||
| 4 | |||
| 3 | Patch has apparently been rejected upstream, not because it is invalid | 5 | 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 | 6 | 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: | 7 | validity of the patch upstream is uncertain. For further details see: |
| 6 | http://bugreports.qt.nokia.com/browse/QTBUG-17962 | 8 | http://bugreports.qt.nokia.com/browse/QTBUG-17962 |
| 7 | 9 | ||
| 8 | Original Author: Pavel Heimlich <tropikhajma at gmail.com> | 10 | Original Author: Pavel Heimlich <tropikhajma at gmail.com> |
| 9 | Upstream-Status: Rejected | ||
| 10 | 11 | ||
| 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.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 | +++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 |