diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch')
-rw-r--r-- | meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch b/meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch new file mode 100644 index 000000000..172499507 --- /dev/null +++ b/meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro | ||
4 | index 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 { | ||
22 | diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro | ||
23 | index 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 | ||