sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ciprian Ciubotariu 2012-03-16 17:56:09 +02:00 committed by Richard Purdie
parent b3311a2cd6
commit 0e471166ca
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch Normal file
View File

@ -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

5
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
View File

@ -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}"