diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-07-12 10:17:19 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-13 12:29:20 +0100 |
| commit | 4a6109fc36fe649b67a3712b2969d501bb241f49 (patch) | |
| tree | e6899e78b8cc5318a56d54dae6cb621686af69b3 /meta/recipes-qt | |
| parent | 8a3692deaf9f143877940bf5e0d02cc3d80c9276 (diff) | |
| download | poky-4a6109fc36fe649b67a3712b2969d501bb241f49.tar.gz | |
Patches: Fix Upstream-Status info
(From OE-Core rev: f2a5b2d143fff8337d2f0d024bc593c55f56a3a3)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -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 |