summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2015-05-18 16:58:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-20 21:40:12 +0100
commitbbad6c226f1ff2657c6095141bbf3ec936a42feb (patch)
tree1403f4ca7efa85ea4770e4e9aec1a5ef4c4cbd44 /meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
parent4a2f9e7eebcfe106738af17917a700d769acf03b (diff)
downloadopenembedded-core-contrib-bbad6c226f1ff2657c6095141bbf3ec936a42feb.tar.gz
qt4: remove Qt Mobility
Qt Mobility is an obsolete and unmaintained framework that is also dependent on gstreamer 0.10 https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
deleted file mode 100644
index 1724995072..0000000000
--- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
-index 8164fbc..54fd8ad 100644
---- a/examples/declarative-camera/declarative-camera.pro
-+++ b/examples/declarative-camera/declarative-camera.pro
-@@ -5,10 +5,10 @@ TEMPLATE=app
-
- QT += declarative network
-
--!maemo5 {
-- contains(QT_CONFIG, opengl) {
-- QT += opengl
-- }
-+contains(QT_CONFIG, opengl): !maemo5 {
-+ QT += opengl
-+} else {
-+ DEFINES += QT_NO_OPENGL
- }
-
- win32 {
-diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
-index 8461beb..eedee2f 100644
---- a/examples/videographicsitem/videographicsitem.pro
-+++ b/examples/videographicsitem/videographicsitem.pro
-@@ -9,7 +9,11 @@ MOBILITY = multimedia
-
- QMAKE_RPATHDIR += $$DESTDIR
-
--!symbian:contains(QT_CONFIG, opengl): QT += opengl
-+contains(QT_CONFIG, opengl): !symbian {
-+ QT += opengl
-+} else {
-+ DEFINES += QT_NO_OPENGL
-+}
-
- HEADERS += videoplayer.h \
- videoitem.h