summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:06:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:27 +0100
commitee14710dbf1c4383ca20851529684f164883cc80 (patch)
tree0416d475b383deef152811659b24bcfa7c40e4da /meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
parentd4ad1b760d0112d0b0823c59da21cc50f6efdda6 (diff)
downloadpoky-ee14710dbf1c4383ca20851529684f164883cc80.tar.gz
qt-mobility: move qt-mobility patches to separate dir
(From OE-Core rev: 8dccc55a623f0c5f3469c7cdf63aa788683aa186) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch')
-rw-r--r--meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch b/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
deleted file mode 100644
index 1724995072..0000000000
--- a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
4index 8164fbc..54fd8ad 100644
5--- a/examples/declarative-camera/declarative-camera.pro
6+++ b/examples/declarative-camera/declarative-camera.pro
7@@ -5,10 +5,10 @@ TEMPLATE=app
8
9 QT += declarative network
10
11-!maemo5 {
12- contains(QT_CONFIG, opengl) {
13- QT += opengl
14- }
15+contains(QT_CONFIG, opengl): !maemo5 {
16+ QT += opengl
17+} else {
18+ DEFINES += QT_NO_OPENGL
19 }
20
21 win32 {
22diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
23index 8461beb..eedee2f 100644
24--- a/examples/videographicsitem/videographicsitem.pro
25+++ b/examples/videographicsitem/videographicsitem.pro
26@@ -9,7 +9,11 @@ MOBILITY = multimedia
27
28 QMAKE_RPATHDIR += $$DESTDIR
29
30-!symbian:contains(QT_CONFIG, opengl): QT += opengl
31+contains(QT_CONFIG, opengl): !symbian {
32+ QT += opengl
33+} else {
34+ DEFINES += QT_NO_OPENGL
35+}
36
37 HEADERS += videoplayer.h \
38 videoitem.h