diff options
Diffstat (limited to 'meta/recipes-qt/qt4/files')
-rw-r--r-- | meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch | 36 |
1 files changed, 36 insertions, 0 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 new file mode 100644 index 0000000000..aa15683a4e --- /dev/null +++ b/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro | ||
2 | index 8164fbc..54fd8ad 100644 | ||
3 | --- a/examples/declarative-camera/declarative-camera.pro | ||
4 | +++ b/examples/declarative-camera/declarative-camera.pro | ||
5 | @@ -5,10 +5,10 @@ TEMPLATE=app | ||
6 | |||
7 | QT += declarative network | ||
8 | |||
9 | -!maemo5 { | ||
10 | - contains(QT_CONFIG, opengl) { | ||
11 | - QT += opengl | ||
12 | - } | ||
13 | +contains(QT_CONFIG, opengl): !maemo5 { | ||
14 | + QT += opengl | ||
15 | +} else { | ||
16 | + DEFINES += QT_NO_OPENGL | ||
17 | } | ||
18 | |||
19 | win32 { | ||
20 | diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro | ||
21 | index 8461beb..eedee2f 100644 | ||
22 | --- a/examples/videographicsitem/videographicsitem.pro | ||
23 | +++ b/examples/videographicsitem/videographicsitem.pro | ||
24 | @@ -9,7 +9,11 @@ MOBILITY = multimedia | ||
25 | |||
26 | QMAKE_RPATHDIR += $$DESTDIR | ||
27 | |||
28 | -!symbian:contains(QT_CONFIG, opengl): QT += opengl | ||
29 | +contains(QT_CONFIG, opengl): !symbian { | ||
30 | + QT += opengl | ||
31 | +} else { | ||
32 | + DEFINES += QT_NO_OPENGL | ||
33 | +} | ||
34 | |||
35 | HEADERS += videoplayer.h \ | ||
36 | videoitem.h | ||