summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-08-30 14:08:21 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-09-05 11:27:00 +0000
commite19a98fcaec0d2ca794419cfd1d5cfd2225b4962 (patch)
treec4ed0b9c25f9c97b2b3140a0fca4617cc67fdd73
parent1e556dfb77c23b7009c9f9670d359b51c9491d14 (diff)
downloadmeta-boot2qt-e19a98fcaec0d2ca794419cfd1d5cfd2225b4962.tar.gz
qt5: update meta-qt5
Update Qt submodules to 5.10 branch. Update QtGlesStream to fix build break caused by submodules update. Update & re-enable QtQuickCompiler. Change-Id: I4069120b6b953d3ed7805f1807f4a0a2e27234e7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--conf/local.conf.sample1
-rw-r--r--recipes-qt/qt5-addons/qtglesstream.bb6
-rw-r--r--recipes-qt/qt5/qtquickcompiler_git.bb2
-rw-r--r--scripts/manifest.xml2
4 files changed, 5 insertions, 6 deletions
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 097c1ce..166ae94 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"
286DISABLE_QTQUICKCOMPILER = "1"
287 286
288ACCEPT_FSL_EULA = "1" 287ACCEPT_FSL_EULA = "1"
289LICENSE_FLAGS_WHITELIST = "commercial" 288LICENSE_FLAGS_WHITELIST = "commercial"
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb
index e9215b6..7443724 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/recipes-qt/qt5-addons/qtglesstream.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2017 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -29,7 +29,7 @@
29 29
30DESCRIPTION = "QtGlesStream" 30DESCRIPTION = "QtGlesStream"
31LICENSE = "The-Qt-Company-DCLA-2.1" 31LICENSE = "The-Qt-Company-DCLA-2.1"
32LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0" 32LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=875f34471470b09977705aed7863e440"
33 33
34inherit qt5-module 34inherit qt5-module
35 35
@@ -38,7 +38,7 @@ SRC_URI = " \
38 " 38 "
39 39
40PV = "1.0.0" 40PV = "1.0.0"
41SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2" 41SRCREV = "17f5dc862f6669261cd08e948b2083bb7dca2b28"
42BRANCH = "dev" 42BRANCH = "dev"
43 43
44S = "${WORKDIR}/git" 44S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 2ca1d7d..80fd072 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
40SRCREV = "7ec4bc57c417b68eb6f6cfcaa26c376883824d61" 40SRCREV = "a08a79fa904a316a52c49323b4250f0fc948dca7"
41 41
42S = "${WORKDIR}/git" 42S = "${WORKDIR}/git"
43 43
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 569c0c8..d18c7be 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,7 +24,7 @@
24 path="sources/meta-openembedded"/> 24 path="sources/meta-openembedded"/>
25 <project name="meta-qt5" 25 <project name="meta-qt5"
26 remote="qtyocto" 26 remote="qtyocto"
27 revision="7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3" 27 revision="e7aec5e219486e10d4145ddd25df4ee6bd7246c9"
28 path="sources/meta-qt5"/> 28 path="sources/meta-qt5"/>
29 <project name="meta-mingw" 29 <project name="meta-mingw"
30 remote="qtyocto" 30 remote="qtyocto"