summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorCiprian Ciubotariu <cheepeero@gmx.net>2012-03-16 15:56:09 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 20:28:47 (GMT)
commit0e471166caab98e9f4e745c211d7509219efa233 (patch)
tree457daa708b552a666c2fc7831a402cf569cdf40a /meta/recipes-qt
parentb3311a2cd69f89eb4d18d200ad004af84011dbbd (diff)
downloadpoky-0e471166caab98e9f4e745c211d7509219efa233.tar.gz
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] (From OE-Core rev: 4ca9ecbdd60f99101b0f6d9fadeb431b3790010a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch36
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc5
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 0000000..aa15683
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
@@ -0,0 +1,36 @@
1diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
2index 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 {
20diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
21index 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
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 1c4611d..3e50b2d 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 \
8SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ 8SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
9 file://qt-mobility-configure.patch \ 9 file://qt-mobility-configure.patch \
10 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \ 10 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
11 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch" 11 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \
12 file://qt-mobility-no-opengl.patch"
12 13
13SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 14SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
14SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" 15SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
15 16
16PR = "r3" 17PR = "r4"
17 18
18S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" 19S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
19 20