From ba5a0bfd217b429be7d3cb941b5fe72bbfc11494 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 30 May 2017 16:59:28 +0300
Subject: qt5: update to 5.10

Qt Quick Compiler needs to be disabled.
Use latest from meta-mingw to get c++11 pthread support.

Change-Id: I03773d08e0c78e87601d73838c67148248244902
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 conf/local.conf.sample                                              | 1 +
 recipes-qt/qt5-addons/qtquickcompiler-sdk.bb                        | 1 -
 recipes-qt/qt5/qtquickcompiler_git.bb                               | 2 +-
 .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb          | 1 +
 scripts/manifest.xml                                                | 6 +++---
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 166ae94..097c1ce 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -283,6 +283,7 @@ 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/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
index 98c3deb..7f3e85b 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
@@ -61,7 +61,6 @@ do_install() {
 do_install_append_mingw32() {
     if [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
         install -m 0644 ${WORKDIR}/libgcc_s_dw2-1.dll ${D}${OE_QMAKE_PATH_BINS}
-        install -m 0644 ${WORKDIR}/libwinpthread-1.dll ${D}${OE_QMAKE_PATH_BINS}
     fi
 }
 
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 23fbaf8..2ca1d7d 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 = "86d362f4ed6baeab0dfc6d892f18458a65ec7361"
+SRCREV = "7ec4bc57c417b68eb6f6cfcaa26c376883824d61"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 9f43fff..9e55ca3 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -57,4 +57,5 @@ RDEPENDS_${PN}_append_mingw32 = "\
     nativesdk-make \
     nativesdk-libgcc \
     nativesdk-libstdc++ \
+    nativesdk-mingw-w64-winpthreads \
     "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index a91147b..4ea0f90 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,12 +24,12 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="e91e6a01a6623225290059073e806217f23e1f07"
+           revision="044ba1621532deed80ef79a15f5b225d8b9471ec"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
-           path="sources/meta-mingw"
-           revision="bfda0f040958b3c533123071ff031037389eed62"/>
+           revision="46d0746d53f863d9d76fa117f1259459803a36e3"
+           path="sources/meta-mingw"/>
 
   <project name="meta-freescale"
            remote="freescale"
-- 
cgit v1.2.3-54-g00ecf