diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-01-25 15:36:46 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-02-12 06:58:59 +0000 |
commit | 50c4963980164ae0e9992d652fd934d85fd2400e (patch) | |
tree | 2e1a1beb461e4ea3b793e87ee0d1583273eb20fa /recipes-qt/qt5/qtvirtualkeyboard_git.bb | |
parent | c907a6caee05b559ee231300a228f88708f9b7c2 (diff) |
qt5: Upgrade to Qt 5.11.0
QtQuickCompiler functionality is now integrated to qtdeclarative and can be
enabled with CONFIG+=qtquickcompiler. Add PACKAGECONFIG to qt5.inc, so that
any qtmodule can take advantage of this. Enable by default for qtcharts and
qtvirtualkeyboard.
Change-Id: I484b4b6c7869b3ca5630ef9685453aecc626137a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtvirtualkeyboard_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 0fca94d6..69970f3b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -17,7 +17,7 @@ SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" #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" @@ -51,6 +51,6 @@ RRECOMMENDS_${PN} += "${PN}-dictionaries" FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" -DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" +DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb" +SRCREV = "93af389b0cb786864af8e54d53c7da308cb557a8" |