From cabaf4ef690ab5dcde901822edfd4fe5067497ac Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 5 Feb 2018 15:50:21 +0200
Subject: qt5: Upgrade to Qt 5.11.0

QtQuickCompiler is now part of qtdeclarative, separate recipe is no longer
needed. Keeping qtquickcompiler.bbclass still for backwards compatibility.

Change-Id: I8e6a66b176fc17c4bb161ae4638125238518e22a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 scripts/manifest.xml          | 2 +-
 scripts/update-qt5-modules.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 1aa053b..46c5f2a 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="a358108b09762390ec951f560540bb99aaf9f2a2"
+           revision="50c4963980164ae0e9992d652fd934d85fd2400e"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index e6d945f..4ae42e8 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -53,9 +53,8 @@ for S in $SHA1S; do
     elif [ "${PROJECT}" = "qtlocation/src/3rdparty/mapbox-gl-native" ]; then
         sed -i -e "/^SRCREV_qtlocation-mapboxgl/s/\".*\"/\"${SHA1}\"/" qtlocation_git.bb*
         echo "qtlocation (mapboxgl) -> ${SHA1}"
-    elif [ "${PROJECT}" = "tqtc-qmlcompiler" ] && [ -e "qtquickcompiler_git.bb" ]; then
-        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb
-        echo "qtquickcompiler -> ${SHA1}"
+    elif [ "${PROJECT}" = "qtenginio" ] || [ "${PROJECT}" = "qtquick1" ] || [ "${PROJECT}" = "qtsystems" ]; then
+        echo "${PROJECT} -> ignored"
     elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then
         sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*
         echo "${PROJECT} -> ${SHA1}"
-- 
cgit v1.2.3-54-g00ecf