summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-12 10:17:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 12:25:21 +0100
commitf2a5b2d143fff8337d2f0d024bc593c55f56a3a3 (patch)
treec2d51e41ae98314f8034e365b3d2aa5fcd9feecd /meta/recipes-qt/qt4
parent12600138721262ce02e9dd243bcf44e52e065179 (diff)
downloadopenembedded-core-f2a5b2d143fff8337d2f0d024bc593c55f56a3a3.tar.gz
openembedded-core-f2a5b2d143fff8337d2f0d024bc593c55f56a3a3.tar.bz2
openembedded-core-f2a5b2d143fff8337d2f0d024bc593c55f56a3a3.zip
Patches: Fix Upstream-Status info
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/files/qt-dbus-const.patch3
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 @@
Remove "const" usage that causes compile failure building qt4-tools-nativesdk
+Upstream-Status: Denied [possible retry]
+
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