From 31d83f1ddb0182aa86e39f55a965face362040b5 Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Tue, 21 Jan 2020 14:41:03 +0100
Subject: [PATCH] Update submodules and disable some failing repositories

Until dev is fixed, we disable some of the broken repos in the qt5
wip/cmake branch: qttools, qtremoteobjects, qtscxml, qtwebsockets,
qtwinextras.

Also switch Windows to be built in Release mode, to circumvent some
issues with Debug builds that are also present in dev. Note qmake
builds in Coin also only build Release builds of Windows for testing.

Change-Id: Ie095fa16920fb6bd92db80118abeb6b282c96897
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 .gitmodules                        | 14 +++++++-------
 coin/platform_configs/default.yaml |  2 +-
 qtbase                             |  2 +-
 qtdeclarative                      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 296053a6..f6546749 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = wip/cmake
+	branch = refs/changes/71/283671/6
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
@@ -14,7 +14,7 @@
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = wip/cmake
+	branch = refs/changes/15/287315/8
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
@@ -42,7 +42,7 @@
 	path = qttools
 	url = ../qttools.git
 	branch = wip/cmake
-	status = essential
+	status = ignore
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -189,7 +189,7 @@
 	path = qtwinextras
 	url = ../qtwinextras.git
 	branch = wip/cmake
-	status = addon
+	status = ignore
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
@@ -202,7 +202,7 @@
 	path = qtwebsockets
 	url = ../qtwebsockets.git
 	branch = wip/cmake
-	status = addon
+	status = ignore
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
@@ -278,7 +278,7 @@
 	path = qtscxml
 	url = ../qtscxml.git
 	branch = wip/cmake
-	status = addon
+	status = ignore
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
@@ -298,7 +298,7 @@
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
 	branch = wip/cmake
-	status = addon
+	status = ignore
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index ab844d64..6a31ea60 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -19,7 +19,7 @@ Configurations:
 -
     Template: 'qtci-windows-10-x86_64-15'
     Compiler: 'MSVC2019'
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
+    Configure arguments: '-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
 -
     Template: 'qtci-linux-RHEL-7.6-x86_64'
     Compiler: 'GCC'
diff --git a/qtbase b/qtbase
index d1be8b9c..cce8ada8 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit d1be8b9ceb2c7b20bbe53a07154c79699540ea3d
+Subproject commit cce8ada8141d786c1deda78fdba485b4c67f9687
diff --git a/qtdeclarative b/qtdeclarative
index b106d86c..7590f072 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit b106d86c433706928b0b0c206a0d9f831681e1bf
+Subproject commit 7590f07278ae2cc4ddade7668b5c34ce16751260