diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-16 15:11:30 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-21 18:37:25 +0000 |
| commit | 820f3ef827b874340e9e42000657a110c9a99440 (patch) | |
| tree | 80a68276ef87452e11d43d8e38134d37eb46ab03 /recipes-qt | |
| parent | e199d801f8a5bd06b2bee3ab9ef89ea9271c902d (diff) | |
qt5: add common PACKAGECONFIG for QtQuickCompiler
The previously commercial-only QtQuickCompiler is now merged into
qtdeclarative. Add common PACKECONFIG which can be used to enable
it, and by default enable it for Qt Charts and Qt VirtualKeyboard.
https://doc-snapshots.qt.io/qt5-5.11/qtquick-deployment.html#compiling-qml-ahead-of-time
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtcharts_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 95e3854c..edae5724 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -7,8 +7,10 @@ PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG[examples] = "" PACKAGECONFIG[tests] = "" +PACKAGECONFIG[qtquickcompiler] = ",,qtdeclarative-native" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtquickcompiler', 'CONFIG+=qtquickcompiler', '', d)}" # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 5b0e6629..a6ec17f8 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -13,3 +13,5 @@ SRCREV = "4f66d1ffeecd95b4bf6666b71536c42dea7450ed" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +PACKAGECONFIG ?= "qtquickcompiler" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 3c6101e4..4154b2a6 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ #SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write" #PACKAGECONFIG = "t9write lang-all" -PACKAGECONFIG ?= "lang-all lipi-toolkit" +PACKAGECONFIG ?= "lang-all lipi-toolkit qtquickcompiler" PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell" PACKAGECONFIG[t9write] = "CONFIG+=t9write" PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" |