diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-18 15:40:16 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-20 11:24:22 +0200 |
| commit | 13056d6d55575ccc805f7ed51840cdcde4f2db28 (patch) | |
| tree | 9e95e01ee33d42f3d18cd9afcaae11192d94e815 | |
| parent | ef706ae03e252f9ac2463c2c49ca29f4e69b290d (diff) | |
| download | meta-qt5-13056d6d55575ccc805f7ed51840cdcde4f2db28.tar.gz | |
qt5: use PACKAGECONFIG to disable tests and examples
Currently if qtbase has tests or examples enabled, they will
be enabled for every Qt module as well. Change the PACKAGECONFIG
options so that they need to be explicitly enabled for each Qt module.
Change-Id: If8dedf6d47ea041ef30ea9e99ba5f357d62d0c8c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e0cd8949..6f9a83c4 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
| @@ -8,8 +8,8 @@ PACKAGECONFIG_OPENSSL ?= "openssl" | |||
| 8 | PACKAGECONFIG[examples] = "" | 8 | PACKAGECONFIG[examples] = "" |
| 9 | PACKAGECONFIG[tests] = "" | 9 | PACKAGECONFIG[tests] = "" |
| 10 | PACKAGECONFIG[qtquickcompiler] = ",,qtdeclarative-native" | 10 | PACKAGECONFIG[qtquickcompiler] = ",,qtdeclarative-native" |
| 11 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" | 11 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', 'QT_BUILD_PARTS-=examples', d)}" |
| 12 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}" | 12 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', 'QT_BUILD_PARTS-=tests', d)}" |
| 13 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtquickcompiler', 'CONFIG+=qtquickcompiler', '', d)}" | 13 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtquickcompiler', 'CONFIG+=qtquickcompiler', '', d)}" |
| 14 | 14 | ||
| 15 | # we don't want conflicts with qt4 | 15 | # we don't want conflicts with qt4 |