summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2013-09-19 13:57:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:33 +0100
commitcb2496c607016e4d89af9ff0ef51bcea0701bd53 (patch)
treea8f6990348818318f4154494ea0542818b4f7b8e /meta/recipes-qt/qt4
parent77ae0d905a5bfce86b64c5e56997830e90fdd319 (diff)
downloadpoky-cb2496c607016e4d89af9ff0ef51bcea0701bd53.tar.gz
qt-mobility: fix build without X11
else we get : arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon .../... ibQtSystemInfoE.so.1 -o libQtSystemInfoE.so.1.2.0 .../... -lblkid -ludev -lX11 -lXrandr -lQtDBusE -lQtXmlE -lQtGuiE -lEGL -lQtNetworkE -lQtCoreE -lpthread .../build/tmp-defaultsetup-eglibc-eglibc/sysroots/x86_64-linux/usr/libexec/armv7a-vfp-neon-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.8.1/ld: cannot find -lXrandr make[2]: *** [../../lib/libQtSystemInfoE.so.1.2.0] Error 1 (From OE-Core rev: 21857f0842501b0c72c77e5fb290aec85b1c28ff) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch73
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc1
2 files changed, 74 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch
new file mode 100644
index 0000000000..d8d88c2cfc
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch
@@ -0,0 +1,73 @@
1From de2b568a4f14f38ae26960f543277bd2ac57c9d6 Mon Sep 17 00:00:00 2001
2From: Alex <qt-info@nokia.com>
3Date: Tue, 10 May 2011 14:54:49 +1000
4Subject: [PATCH] fix !embedded usage (doesn't work outside of Qt)
5
6embedded is part of QT_CONFIG and not CONFIG
7
8Task-number: QTMOBILITY-1586
9---
10Upstream-Status: Backport
11https://qt.gitorious.org/qt-mobility/qt-mobility/commit/de2b568a4f14f38ae26960f543277bd2ac57c9d6
12EB: refreshed the patch for it to apply properly
13
14 plugins/multimedia/gstreamer/gstreamer.pro | 2 +-
15 src/systeminfo/systeminfo.pro | 6 +++---
16 tests/auto/auto.pro | 2 +-
17 3 files changed, 5 insertions(+), 5 deletions(-)
18
19Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro
20===================================================================
21--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:34:40.880862884 +0200
22+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:35:22.844862550 +0200
23@@ -85,7 +85,7 @@
24 qgstutils.cpp
25
26
27-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
28+!win32:!contains(QT_CONFIG,embedded):!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
29 LIBS += -lXv -lX11 -lXext
30
31 HEADERS += \
32Index: qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro
33===================================================================
34--- qt-mobility-opensource-src-1.2.0.orig/src/systeminfo/systeminfo.pro 2013-09-19 10:34:40.884862884 +0200
35+++ qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro 2013-09-19 10:36:05.480862210 +0200
36@@ -101,7 +101,7 @@
37 LIBS += -lblkid
38 }
39
40- !embedded:!contains(QT_CONFIG,qpa): {
41+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): {
42 LIBS += -lX11 -lXrandr
43 }
44
45@@ -154,7 +154,7 @@
46 #for now... udisks
47 } else {
48 DEFINES += QT_NO_UDISKS
49- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
50+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
51 }
52
53 contains(connman_enabled, yes): {
54@@ -165,7 +165,7 @@
55 }
56 } else {
57 DEFINES += QT_NO_NETWORKMANAGER QT_NO_UDISKS QT_NO_CONNMAN
58- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
59+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
60 }
61 }
62
63Index: qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro
64===================================================================
65--- qt-mobility-opensource-src-1.2.0.orig/tests/auto/auto.pro 2013-09-19 10:34:40.884862884 +0200
66+++ qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro 2013-09-19 10:35:22.844862550 +0200
67@@ -21,5 +21,5 @@
68 # which require that the autotest is run on the same machine
69 # doing the build - i.e. cross-compilation is not allowed.
70 win32|mac|linux-g++* {
71- !embedded:!maemo5:!maemo6:SUBDIRS+=host.pro
72+ !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro
73 }
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 b9367a850c..062702ff5a 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -18,6 +18,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
18 file://qt-mobility-no-opengl.patch \ 18 file://qt-mobility-no-opengl.patch \
19 file://gcc-scope.patch \ 19 file://gcc-scope.patch \
20 file://qt-mobility-no-xvideo.patch \ 20 file://qt-mobility-no-xvideo.patch \
21 file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \
21 " 22 "
22 23
23SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 24SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"