summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe F. Tonello <ftonello@cercacor.com>2013-03-20 11:29:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 17:01:13 +0100
commit94041f2b3a5bcaea1b97f8916ccf7cda23cbb5cc (patch)
tree4c9e69115f3b6fc5e2c9be48f4a5175b8f7fd253
parent27296bd8e6759c2f94477c14787837a761f16163 (diff)
downloadpoky-94041f2b3a5bcaea1b97f8916ccf7cda23cbb5cc.tar.gz
qt-mobility: added list of modules to be compiled
This is useful for users that want to .bbappend this recipe to select specific modules to be compiled. (From OE-Core rev: 2ddb7afd15e53ef75b5084d691115e0f58ff24ab) Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc6
1 files changed, 4 insertions, 2 deletions
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 fca4cb0a13..1db143817d 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -18,7 +18,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
18SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 18SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
19SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" 19SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
20 20
21PR = "r7" 21PR = "r8"
22 22
23S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" 23S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
24 24
@@ -31,6 +31,8 @@ qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility"
31qtm_data := "/usr/share/${qtm_dir}" 31qtm_data := "/usr/share/${qtm_dir}"
32qtm_imports := "/usr/lib/${qtm_dir}/imports" 32qtm_imports := "/usr/lib/${qtm_dir}/imports"
33 33
34QTM_MODULES_LIST ?= "bearer contacts gallery location publishsubscribe messaging multimedia \
35systeminfo serviceframework sensors versit organizer feedback connectivity"
34qtm_bluezflag ?= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'yes', 'no', d)}" 36qtm_bluezflag ?= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'yes', 'no', d)}"
35 37
36do_configure_prepend() { 38do_configure_prepend() {
@@ -44,7 +46,7 @@ do_configure_prepend() {
44 cp staticconfig.pri staticconfig.pri.old 46 cp staticconfig.pri staticconfig.pri.old
45 echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)" >staticconfig.pri 47 echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)" >staticconfig.pri
46 cat staticconfig.pri.old >>staticconfig.pri 48 cat staticconfig.pri.old >>staticconfig.pri
47 ./configure -qmake-exec qmake2 -prefix /usr -examples -demos 49 ./configure -qmake-exec qmake2 -prefix /usr -examples -demos -modules "${QTM_MODULES_LIST}"
48 echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri 50 echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
49 echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri 51 echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
50 echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri 52 echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri