From e19a98fcaec0d2ca794419cfd1d5cfd2225b4962 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Wed, 30 Aug 2017 14:08:21 +0300
Subject: 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>
---
 conf/local.conf.sample                | 1 -
 recipes-qt/qt5-addons/qtglesstream.bb | 6 +++---
 recipes-qt/qt5/qtquickcompiler_git.bb | 2 +-
 scripts/manifest.xml                  | 2 +-
 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"
 
 # Enables use of QtQuickCompiler if you have access to the gerrit project
 #ENABLE_QTQUICKCOMPILER = "1"
-DISABLE_QTQUICKCOMPILER = "1"
 
 ACCEPT_FSL_EULA = "1"
 LICENSE_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 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "QtGlesStream"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0"
+LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=875f34471470b09977705aed7863e440"
 
 inherit qt5-module
 
@@ -38,7 +38,7 @@ SRC_URI = " \
     "
 
 PV = "1.0.0"
-SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2"
+SRCREV = "17f5dc862f6669261cd08e948b2083bb7dca2b28"
 BRANCH = "dev"
 
 S = "${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 = " \
     git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
     "
 
-SRCREV = "7ec4bc57c417b68eb6f6cfcaa26c376883824d61"
+SRCREV = "a08a79fa904a316a52c49323b4250f0fc948dca7"
 
 S = "${WORKDIR}/git"
 
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 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3"
+           revision="e7aec5e219486e10d4145ddd25df4ee6bd7246c9"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
-- 
cgit v1.2.3-54-g00ecf