diff options
| author | Ciprian Ciubotariu <cheepeero@gmx.net> | 2012-03-16 17:56:09 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 20:27:15 +0000 |
| commit | 4ca9ecbdd60f99101b0f6d9fadeb431b3790010a (patch) | |
| tree | b5c802a73bae0b63119e68650a8ac6425290195f /meta/recipes-qt/qt4 | |
| parent | fc6f49e283423b3ad25b1e7463fdf4e73a8a1f35 (diff) | |
| download | openembedded-core-4ca9ecbdd60f99101b0f6d9fadeb431b3790010a.tar.gz openembedded-core-4ca9ecbdd60f99101b0f6d9fadeb431b3790010a.tar.bz2 openembedded-core-4ca9ecbdd60f99101b0f6d9fadeb431b3790010a.zip | |
qt-mobility: fix build in the absence of opengl
QMake pro files don't explicitly define QT_NO_OPENGL if the
configuration lacks opengl, but example code relies on this define.
[rebased to current code - sgw]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
| -rw-r--r-- | meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 5 |
2 files changed, 39 insertions, 2 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 @@ +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 diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index 1c4611db05..3e50b2db2c 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ file://qt-mobility-configure.patch \ file://0001-gstvideoconnector-fixed-buffers-allocation.patch \ - file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch" + file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \ + file://qt-mobility-no-opengl.patch" SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" -PR = "r3" +PR = "r4" S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" |