summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
diff options
context:
space:
mode:
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