diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-17 13:55:43 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-02-13 12:33:11 +0000 |
commit | cbfd8dd6a9ff034ec1e2839c1e72ee0973163195 (patch) | |
tree | 65bd6894d3e0a11754af5a200809310199d076c7 | |
parent | 81dbc7025bc875afa6d3ea03ce87f7d12cabb907 (diff) | |
download | meta-boot2qt-cbfd8dd6a9ff034ec1e2839c1e72ee0973163195.tar.gz |
qt5: Update to Qt 5.9.0
QtQuickCompiler disabled due to QTRD-2220
Change-Id: Ifc94f1f52ae5db245d95b1cdacc0b9e37369be77
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | conf/local.conf.sample | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcompiler_git.bb | 2 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/conf/local.conf.sample b/conf/local.conf.sample index f98c43b..81fd5c7 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample | |||
@@ -283,6 +283,7 @@ INHERIT += "internal-build" | |||
283 | 283 | ||
284 | # Enables use of QtQuickCompiler if you have access to the gerrit project | 284 | # Enables use of QtQuickCompiler if you have access to the gerrit project |
285 | #ENABLE_QTQUICKCOMPILER = "1" | 285 | #ENABLE_QTQUICKCOMPILER = "1" |
286 | DISABLE_QTQUICKCOMPILER = "1" | ||
286 | 287 | ||
287 | ACCEPT_FSL_EULA = "1" | 288 | ACCEPT_FSL_EULA = "1" |
288 | LICENSE_FLAGS_WHITELIST = "commercial" | 289 | LICENSE_FLAGS_WHITELIST = "commercial" |
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index fd2a901..63f0f6a 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb | |||
@@ -37,7 +37,7 @@ SRC_URI = " \ | |||
37 | git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ | 37 | git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ |
38 | " | 38 | " |
39 | 39 | ||
40 | SRCREV = "f7d0d43749d9bbd4c695738697ad95998a49956a" | 40 | SRCREV = "8df367f3a7356337dba25666c52e73e3b0480df3" |
41 | 41 | ||
42 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
43 | 43 | ||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ac0bb87..4d82e47 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -23,7 +23,7 @@ | |||
23 | path="sources/meta-openembedded"/> | 23 | path="sources/meta-openembedded"/> |
24 | <project name="meta-qt5" | 24 | <project name="meta-qt5" |
25 | remote="qtyocto" | 25 | remote="qtyocto" |
26 | revision="02dca2673dba478ee11bfbab62888d2cdbe961e4" | 26 | revision="0cc8a8a21e1ba7ffa237c64608b2a6678897c096" |
27 | path="sources/meta-qt5"/> | 27 | path="sources/meta-qt5"/> |
28 | <project name="meta-mingw" | 28 | <project name="meta-mingw" |
29 | remote="qtyocto" | 29 | remote="qtyocto" |