diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-22 14:18:06 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-22 14:18:08 +0100 |
commit | 6ec88245642cfe16bdd21abdbb8f3fabe13c96b9 (patch) | |
tree | d06c3858b9a374358651277bd2c5c8b3994ee6fe /recipes-qt/qt5/qtbase.inc | |
parent | 04013e13b1368d86dfa6567807a3345b1de1dc6b (diff) |
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase.inc')
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 9 |
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 ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" -PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets" +PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs" PACKAGECONFIG ?= " \ ${PACKAGECONFIG_RELEASE} \ @@ -62,8 +62,11 @@ PACKAGECONFIG ?= " \ PACKAGECONFIG[release] = "-release,-debug" PACKAGECONFIG[developer] = "-developer-build" PACKAGECONFIG[sm] = "-sm,-no-sm" -PACKAGECONFIG[tests] = ",-nomake tests" -PACKAGECONFIG[examples] = ",-nomake examples" +PACKAGECONFIG[tests] = "-make tests,-nomake tests" +PACKAGECONFIG[examples] = "-make examples,-nomake examples" +PACKAGECONFIG[tools] = "-make tools,-nomake tools" +# only for completeness, configure will add libs even if you try to explicitly remove it +PACKAGECONFIG[libs] = "-make libs,-nomake libs" # accessibility is required to compile qtquickcontrols PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" |