diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:06:25 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:16 +0100 |
| commit | 8dccc55a623f0c5f3469c7cdf63aa788683aa186 (patch) | |
| tree | 8b2dbaf4e65c9bf49102dcdcf0d049085a6dadfa /meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch | |
| parent | 34e3687394c6fa18ef0443d63b8d7d0a68c441e0 (diff) | |
| download | openembedded-core-contrib-8dccc55a623f0c5f3469c7cdf63aa788683aa186.tar.gz | |
qt-mobility: move qt-mobility patches to separate dir
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch | 38 |
1 files changed, 38 insertions, 0 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 new file mode 100644 index 0000000000..1724995072 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch @@ -0,0 +1,38 @@ +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 |