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/qt5-git.inc | |
| parent | c907a6caee05b559ee231300a228f88708f9b7c2 (diff) | |
| download | meta-qt5-50c4963980164ae0e9992d652fd934d85fd2400e.tar.gz | |
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/qt5-git.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 7ee06438..94f2bfbc 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com> |
| 3 | 3 | ||
| 4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
| 5 | QT_MODULE_BRANCH ?= "5.10" | 5 | QT_MODULE_BRANCH ?= "5.11" |
| 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" |
| 7 | 7 | ||
| 8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
| @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
| 16 | 16 | ||
| 17 | PV = "5.10.1+git${SRCPV}" | 17 | PV = "5.11.0+git${SRCPV}" |