diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-04-20 09:11:49 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-04-20 11:18:17 +0000 |
commit | 70be5526bd98a97c60301c83c1a88e7bb6b19360 (patch) | |
tree | 2e5035e03536f4e29a6b58c873e329de6c39eb57 | |
parent | 40bbe3da18da106c3e41a151e6bb1c593994bfe1 (diff) | |
download | meta-boot2qt-70be5526bd98a97c60301c83c1a88e7bb6b19360.tar.gz |
Update and re-enable QtQuickCompiler
Change-Id: Idb019e6d056815be968aca7ef4bd7a40ef28d3da
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 |
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 81fd5c7..f98c43b 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample | |||
@@ -283,7 +283,6 @@ 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" | ||
287 | 286 | ||
288 | ACCEPT_FSL_EULA = "1" | 287 | ACCEPT_FSL_EULA = "1" |
289 | LICENSE_FLAGS_WHITELIST = "commercial" | 288 | LICENSE_FLAGS_WHITELIST = "commercial" |
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 63f0f6a..23fbaf8 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 = "8df367f3a7356337dba25666c52e73e3b0480df3" | 40 | SRCREV = "86d362f4ed6baeab0dfc6d892f18458a65ec7361" |
41 | 41 | ||
42 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
43 | 43 | ||