summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-22 14:18:06 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-22 14:18:08 +0100
commit6ec88245642cfe16bdd21abdbb8f3fabe13c96b9 (patch)
treed06c3858b9a374358651277bd2c5c8b3994ee6fe
parent04013e13b1368d86dfa6567807a3345b1de1dc6b (diff)
downloadmeta-qt5-6ec88245642cfe16bdd21abdbb8f3fabe13c96b9.tar.gz
qtbase: Fix PACKAGECONFIG[tests]
* at least in 5.2.1 tests aren't enabled by default: QT_ALL_BUILD_PARTS=" libs tools examples tests " QT_DEFAULT_BUILD_PARTS="libs tools examples" so without -make option they weren't enabled even with tests in PACKAGECONFIG * add options for other build parts just for completeness Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtbase.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 6c477304..378f229b 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -44,7 +44,7 @@ PACKAGECONFIG_DISTRO ?= ""
44PACKAGECONFIG_RELEASE ?= "release" 44PACKAGECONFIG_RELEASE ?= "release"
45# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency 45# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency
46# PACKAGECONFIG_OPENSSL ?= "openssl" 46# PACKAGECONFIG_OPENSSL ?= "openssl"
47PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets" 47PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs"
48 48
49PACKAGECONFIG ?= " \ 49PACKAGECONFIG ?= " \
50 ${PACKAGECONFIG_RELEASE} \ 50 ${PACKAGECONFIG_RELEASE} \
@@ -62,8 +62,11 @@ PACKAGECONFIG ?= " \
62PACKAGECONFIG[release] = "-release,-debug" 62PACKAGECONFIG[release] = "-release,-debug"
63PACKAGECONFIG[developer] = "-developer-build" 63PACKAGECONFIG[developer] = "-developer-build"
64PACKAGECONFIG[sm] = "-sm,-no-sm" 64PACKAGECONFIG[sm] = "-sm,-no-sm"
65PACKAGECONFIG[tests] = ",-nomake tests" 65PACKAGECONFIG[tests] = "-make tests,-nomake tests"
66PACKAGECONFIG[examples] = ",-nomake examples" 66PACKAGECONFIG[examples] = "-make examples,-nomake examples"
67PACKAGECONFIG[tools] = "-make tools,-nomake tools"
68# only for completeness, configure will add libs even if you try to explicitly remove it
69PACKAGECONFIG[libs] = "-make libs,-nomake libs"
67# accessibility is required to compile qtquickcontrols 70# accessibility is required to compile qtquickcontrols
68PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" 71PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility"
69PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" 72PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"