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 | |
parent | 04013e13b1368d86dfa6567807a3345b1de1dc6b (diff) | |
download | meta-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.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 ?= "" | |||
44 | PACKAGECONFIG_RELEASE ?= "release" | 44 | PACKAGECONFIG_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" |
47 | PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets" | 47 | PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs" |
48 | 48 | ||
49 | PACKAGECONFIG ?= " \ | 49 | PACKAGECONFIG ?= " \ |
50 | ${PACKAGECONFIG_RELEASE} \ | 50 | ${PACKAGECONFIG_RELEASE} \ |
@@ -62,8 +62,11 @@ PACKAGECONFIG ?= " \ | |||
62 | PACKAGECONFIG[release] = "-release,-debug" | 62 | PACKAGECONFIG[release] = "-release,-debug" |
63 | PACKAGECONFIG[developer] = "-developer-build" | 63 | PACKAGECONFIG[developer] = "-developer-build" |
64 | PACKAGECONFIG[sm] = "-sm,-no-sm" | 64 | PACKAGECONFIG[sm] = "-sm,-no-sm" |
65 | PACKAGECONFIG[tests] = ",-nomake tests" | 65 | PACKAGECONFIG[tests] = "-make tests,-nomake tests" |
66 | PACKAGECONFIG[examples] = ",-nomake examples" | 66 | PACKAGECONFIG[examples] = "-make examples,-nomake examples" |
67 | PACKAGECONFIG[tools] = "-make tools,-nomake tools" | ||
68 | # only for completeness, configure will add libs even if you try to explicitly remove it | ||
69 | PACKAGECONFIG[libs] = "-make libs,-nomake libs" | ||
67 | # accessibility is required to compile qtquickcontrols | 70 | # accessibility is required to compile qtquickcontrols |
68 | PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" | 71 | PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" |
69 | PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" | 72 | PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" |