Provisioning: Renew iPhone signing tools

Task-number: QTQAINFRA-3434
Change-Id: I53665bf4e0799da7a23ba60aff37e26052d0374a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit c1b06ec3e5)

.gitmodules

@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.15.0
+	branch = 5.14
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.15.0
+	branch = 5.14
 	status = deprecated
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,99 +123,99 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.15.0
+	branch = 5.14
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.15.0
+	branch = 5.14
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 5.15.0
+	branch = 5.14
-	status = addon
+	status = preview
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 5.15.0
+	branch = 5.14
-	status = addon
+	status = preview
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 5.15.0
+	branch = 5.14
-	status = addon
+	status = preview

coin/platform_configs/default.yaml

@@ -1,45 +1,56 @@
 Version: 2
+Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Compiler: 'MSVC2015'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
 -
     Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target arch: 'x86'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
+    Target arch: 'x86'
+    Compiler: 'MSVC2019'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
+-
+    Template: 'qtci-windows-10-x86_64-16'
     Compiler: 'MSVC2015'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'x86'
     Compiler: 'MSVC2015'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'armv7'
     Compiler: 'MSVC2015'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
+-
+    Template: 'qtci-windows-10-x86_64-16'
+    Compiler: 'MSVC2019'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
@@ -47,7 +58,12 @@ Configurations:
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
@@ -55,16 +71,16 @@ Configurations:
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-15.0-x86_64'
     Compiler: 'GCC'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-15.0-x86_64'
     Compiler: 'ICC_18'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-15.0-x86_64'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests']
@@ -78,7 +94,7 @@ Configurations:
     Template: 'qtci-linux-RHEL-7.6-x86_64'
     Compiler: 'GCC'
     Features: ['Packaging']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Compiler: 'Clang'
@@ -100,6 +116,20 @@ Configurations:
     Compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'TvOS_ANY'
+    Target arch: 'multi'
+    Compiler: 'Clang'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'WatchOS_ANY'
+    Target arch: 'multi'
+    Compiler: 'Clang'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
 -
     Template: 'qtci-linux-RHEL-7.6-x86_64'
     Target os: 'Android_ANY'

coin/platform_configs/flashing-wizard.yaml

@@ -2,13 +2,13 @@ Version: 2
 Module only: True
 Configurations:
     -
-        Template: 'qtci-windows-10-x86_64-17'
+        Template: 'qtci-windows-10-x86_64-16'
-        Compiler: 'MSVC2019'
+        Compiler: 'MSVC2017'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
     -
-        Template: 'qtci-windows-10-x86_64-17'
+        Template: 'qtci-windows-10-x86_64-16'
-        Compiler: 'MSVC2019'
+        Compiler: 'MSVC2017'
         Target arch: 'x86'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'

coin/platform_configs/qdb.yaml

@@ -2,13 +2,13 @@ Version: 2
 Module only: True
 Configurations:
     -
-        Template: 'qtci-windows-10-x86_64-17'
+        Template: 'qtci-windows-10-x86_64-16'
         Compiler: 'MSVC2015'
         Target arch: 'x86'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
     -
-        Template: 'qtci-windows-10-x86_64-17'
+        Template: 'qtci-windows-10-x86_64-16'
         Compiler: 'MSVC2015'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
@@ -17,11 +17,6 @@ Configurations:
         Compiler: 'GCC'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-    -
-        Template: 'qtci-macos-10.13-x86_64-2'
-        Compiler: 'Clang'
-        Features: ['Packaging']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
     -
         Template: 'qtci-linux-Ubuntu-18.04-x86_64'
         Compiler: 'GCC'

coin/platform_configs/qt5.yaml

@@ -1,49 +1,44 @@
-Version: 2
-Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Compiler: 'MSVC2015'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'x86'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x86-msvc2019'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017'
 -
     Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'armv7'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'Android_ANY'
     Target arch: 'multi'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
     Target compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
@@ -63,27 +58,24 @@ Configurations:
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'armv7'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'armv8'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'x86_64'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc'
 -
@@ -101,10 +93,9 @@ Configurations:
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WebAssembly'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
 -

coin/platform_configs/qtbase.yaml

@@ -13,13 +13,13 @@
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'x86_64'
     Compiler: 'MSVC2015'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-openSUSE-15.0-x86_64'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Features: ['DisableTests']

coin/platform_configs/qtconnectivity.yaml

@@ -1,5 +1,5 @@
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'x86_64'
     Compiler: 'MSVC2015'

coin/platform_configs/qtsaferenderer.yaml

@@ -1,14 +1,10 @@
-Version: 2
-Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -

coin/platform_configs/qtsdk.yaml

@@ -1,6 +1,6 @@
 -
     Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
 -
     Template: 'qtci-linux-RHEL-6.6-x86_64'

coin/platform_configs/qtwebkit.yaml

@@ -1,9 +1,6 @@
-Version: 2
-Configurations:
 -
     Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
+    Compiler: 'Mingw73'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
 -

coin/platform_configs/tqtc-qt-config-gui.yaml

@@ -2,13 +2,13 @@ Version: 2
 Module only: True
 Configurations:
     -
-        Template: 'qtci-windows-10-x86_64-17'
+        Template: 'qtci-windows-10-x86_64-16'
-        Compiler: 'MSVC2019'
+        Compiler: 'MSVC2017'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
     -
-        Template: 'qtci-windows-10-x86_64-17'
+        Template: 'qtci-windows-10-x86_64-16'
-        Compiler: 'MSVC2019'
+        Compiler: 'MSVC2017'
         Target arch: 'x86'
         Features: ['Packaging']
         Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'

coin/platform_configs/tqtc-qt-rta.yaml

@@ -10,5 +10,5 @@
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
 -
     Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2017'
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,50 +1,14 @@
 # List about manual pre-installations to Tier1 image:
 
-Virtual Hardware:
+Vmware tools: installed
-CPU: 4
+Resolution: 1280 X 800
-Memory: 8 GB
+Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin)
-Hard Disk: 550 GB
+Remote Desktop Connection: enabled
-CI_NW
+Timezone: set to UTC
-Video Card - total memory: 32MB
+Administrator tools - services - Windows search: stop & disable
-
+Power settings screen & slee: never
-VM Options:
+Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
-Boot options/Firmware: BIOS
+MSVC 2019 build tools (default installation, no additional selections).
-
+    * Install after MSVC2019 is installed!
-Language: English US
+    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
-Keyboard: finnish
+    * Version: 16.3.10
-location: finnish
-Windows 10 Enterprise
-Region: Finland
-Keyboard layout: Finnish
-
-* VMware tools (complete) installed
-* Resolution set to 1280x800
-* Coin-setup:
-   - Installing Boostrap agent
-   - Disabling fast boot
-   - Disabling firewall
-   - Disabling UAC
-   - Enabling autologin
-   - Automatic login
-   - Disabling windows updates
-* Windows Defender Antivirus turned off: Open 'gpedit.msc':  'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
-   - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'
-   - NOTE! Without this step windows defender can't be disabled!
-* Remote connections allowed:
-   - Enable Remote Desktop
-* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule"
-   - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"'
-* Time zone: Coordinated Universal Time
-* Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable
-* Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable
-* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never'
-* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support
-* Google Chrome installed for RTA
-* Turn off Virus & threat protection (all sections) manually
-   - Real-tiem protection -> off
-   - Cloud-delivered protection -> off
-   - Automatic sample submission -> off
-   - Tamper protection -> off
-* Activate Windows
-* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs'
-   - Add feature 'Debugging Tools for Windows'

coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1

@@ -1,8 +0,0 @@
-# This script will disable automatic disk cleanup
-
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
-
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F"
-
-# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space.
-DisableSchedulerTask "DiskCleanup\SilentCleanup"

coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # Disable the NTP from syncing
 Run-Executable "w32tm.exe" "/config /syncfromflags:NO"

coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will remove unneeded Tasks from Task Scheduler
 

coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1

@@ -8,6 +8,7 @@ icacls $path /grant Administrators:F /T
 SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE
 del "$path\Schedule Scan"
 del "$path\Schedule Scan Static Task"
+del "$path\Backup Scan"
 del "$path\UpdateModelTask"
 del "$path\USO_UxBroker"
 

coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1

@@ -35,14 +35,10 @@
 #
 # If disabled manually, windows will automatically enable it after
 # some period of time. Disabling it speeds up the builds.
-# NOTE! Windows Defender Antivirus needs to be turned off!
-#     Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
-#     Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'
 
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
 
 # 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
 DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1

@@ -33,7 +33,7 @@
 
 # Visual Studio $version was installed manually using $installer.
 $version = "2015 update 3"
-$version_number ="14.0.25420.1"
+$version_number ="14.0.25431.01"
 $installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978"
 
 # default plus following components were selected:

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1

@@ -0,0 +1,88 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# Visual Studio $version version $version_number was installed manually using $installer.
+
+$version = "2017"
+# Current version was manually upgraded from the installer
+$version_number = "15.9.17"
+$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe"
+
+# Following components were selected from installer:
+# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)
+# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK)
+# Microsoft.Component.NetFX.Native (.NET Native)
+# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack)
+# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server)
+# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references)
+# Microsoft.Component.ClickOnce (ClickOnce Publishing)
+# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools)
+# Microsoft.VisualStudio.Component.NuGet (NuGet package manager)
+# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools)
+# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation)
+# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers)
+# Microsoft.Component.MSBuild (MSBuild)
+# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools)
+# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update)
+# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM)
+# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64)
+# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake)
+# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools)
+# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools)
+# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics)
+# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger)
+# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic)
+# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support)
+# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services)
+# Component.Linux.CMake (Visual C++ tools for CMake and Linux)
+# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features)
+# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX)
+# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors)
+# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK)
+# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK)
+# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK)
+# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64)
+# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64])
+# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS)
+# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++)
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64])
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS)
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++)
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64])
+# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0))
+
+echo "Visual Studio = $version version version_number" >> ~\versions.txt

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1

@@ -0,0 +1,91 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# Visual Studio $version version $version_number was installed manually using $installer.
+
+$version = "2019"
+# Current version was manually upgraded from the installer
+$version_number = "16.3.10"
+$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
+
+.NET Framework 4.5 targeting pack
+.NET Framework 4.5.1 targeting pack
+.NET Framework 4.5.2 targeting pack
+.NET Framework 4.6.1 SDK
+.NET Framework 4.6.1 targeting pack
+.NET Framework 4.6.2 SDK
+.NET Framework 4.6.2 targeting pack
+.NET Framework 4.7.2 SDK
+.NET Framework 4.7.2 targeting pack
+.NET Native
+.NET Portable Library targeting pack
+CLR data typer for SQL Sever
+Connectivity and publishing tools
+Data sources for SQL Server support
+SQL ADAL runtime
+SQL Server Command Linne Utilities
+SQL Server Data Tools
+SQL Server Express 2016 LocalDB
+SQL Server ODBC Driver
+ClickOnce Publishing
+Developer Analytics tools
+NuGet package manager
+Text Template Transformation
+C# and Visual Basic Roslyn compilers
+C++ 2019 Redistributable Update
+C++ Cmake tools for Windows
+C++/CLI support for v142 build tools
+MSBuild
+MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
+MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
+MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
+.NET profiling tools
+C++ profiling tools
+JavaScript diagnostics
+Just-In-Time debugger
+C# and Visual Basic
+C++ core features
+JavaSript and TypeScript language support
+Razor Language Services
+Graphics debugger and GPU profiler for DirectX
+Image and 3D model editors
+C++ ATL for v142 build tools (x86 & x64)
+TypeScript 3.3 SDK
+Windows 10 SDK (10.0.16299.0)
+Windows 10 SDK (10.0.17134.0)
+Windows 10 SDK (10.0.17763.0)
+Windows 10 SDK (10.0.18362.0)
+
+# NOTE! Work loads were added during installation!
+
+echo "Visual Studio = $version version version_number" >> ~\versions.txt

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt

@@ -1,67 +0,0 @@
-# Visual Studio $version version $version_number was installed manually using $installer.
-
-$version = "2019"
-# Current version was manually upgraded from the installer
-$version_number = "16.4.4"
-$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
-
-MSVC 2019 build tools (default installation, no additional selections).
-    * Install after MSVC2019 is installed!
-    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
-    * Version: 16.4.4
-
-Installed MSVC-2019 Components:
-
-.NET Framework 4.5 targeting pack
-.NET Framework 4.5.1 targeting pack
-.NET Framework 4.5.2 targeting pack
-.NET Framework 4.6.1 SDK
-.NET Framework 4.6.1 targeting pack
-.NET Framework 4.6.2 SDK
-.NET Framework 4.6.2 targeting pack
-.NET Framework 4.7.2 SDK
-.NET Framework 4.7.2 targeting pack
-.NET Native
-.NET Portable Library targeting pack
-CLR data typer for SQL Sever
-Connectivity and publishing tools
-Data sources for SQL Server support
-SQL ADAL runtime
-SQL Server Command Linne Utilities
-SQL Server Data Tools
-SQL Server Express 2016 LocalDB
-SQL Server ODBC Driver
-ClickOnce Publishing
-Developer Analytics tools
-NuGet package manager
-Text Template Transformation
-C# and Visual Basic Roslyn compilers
-C++ 2019 Redistributable Update
-C++ Cmake tools for Windows
-C++/CLI support for v142 build tools /14.24)
-MSBuild
-MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM build tools (v14.24)
-MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24)
-MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
-MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24)
-.NET profiling tools
-C++ profiling tools
-JavaScript diagnostics
-Just-In-Time debugger
-C# and Visual Basic
-C++ core features
-JavaSript and TypeScript language support
-Razor Language Services
-Graphics debugger and GPU profiler for DirectX
-Image and 3D model editors
-C++ ATL for latest v142 build tools (x86 & x64)
-TypeScript 3.7 SDK
-Windows 10 SDK (10.0.16299.0)
-Windows 10 SDK (10.0.17134.0)
-Windows 10 SDK (10.0.17763.0)
-Windows 10 SDK (10.0.18362.0)
-
-# NOTE! Work loads were added during installation!
-

coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1

@@ -1,8 +1,6 @@
-#!/usr/bin/env bash
-
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -32,12 +30,38 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+. "$PSScriptRoot\helpers.ps1"
 
-# Install libusb
+# Install Cumulative Servicing Release Visual Studio 2015 update 3
-set -ex
+# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
 
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+$version = "2015 update3 (KB3165756)"
-brew install libusb
+$packagePath = "C:\Windows\Temp"
-read -r -a arr <<< $(brew list --versions libusb)
+$package = $packagePath + "\vs14-kb3165756.exe"
-version=${arr[1]}
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe"
-echo "libusb = $version" >> ~/versions.txt
+$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
+$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
+$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update"
+
+if (Test-Path $preparedPackage) {
+    # The prepared package contains updated packages so that not everything has to be downloaded
+    Write-Host "Using prepared package"
+    Copy-Item -Recurse $preparedPackage $packagePath
+    # Remove the whole downloaded folder
+    $toRemove = $packagePath + "\vs14-kb3165756-update"
+    $executable = "$toRemove\vs14-kb3165756.exe"
+} else {
+    Write-Host "Fetching patch for Visual Studio $version..."
+    Download $url_official $url_cache $package
+    $executable = $package
+    # Remove the downloaded executable
+    $toRemove = $executable
+}
+
+Verify-Checksum $executable $sha1
+Write-Host "Installing patch for Visual Studio $version..."
+Run-Executable $executable "/norestart /passive"
+
+Remove-Item -Force -Recurse -Path $toRemove
+
+Write-Output "Visual Studio = $version" >> ~\versions.txt

coin/provisioning/common/linux/gcc.sh

@@ -88,15 +88,15 @@ function InstallGCC() {
 
     # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
     if [ -f "/usr/sbin/update-alternatives" ]; then
-        sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \
+        sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
-                                           --slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \
+                                           --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
-                                           --slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \
+                                           --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
-                                           --slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}"
+                                           --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
     else
-        sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
+        sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
     fi
 
     echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf

coin/provisioning/common/macos/pkgconfig.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Install pkgconfig
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-brew install pkgconfig
-read -r -a arr <<< $(brew list --versions pkgconfig)
-version=${arr[1]}
-echo "pkgconfig = $version" >> ~/versions.txt

coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh

@@ -67,9 +67,6 @@ function InstallFromCompressedFileFromURL {
         "xz")
             tar -xf "$targetFile" --directory "$targetDirectory"
         ;;
-        "tbz2")
-            tar -xjf "$targetFile" --directory "$targetDirectory"
-        ;;
         *)
             exit 1
         ;;

coin/provisioning/common/unix/emsdk.sh

@@ -39,55 +39,59 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="1.39.8"
+version="1.38.27"
+version_node="8.9.1"
+urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages"
 urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
 targetFolder="/opt/emsdk"
 
-# cross-platform emscripten SDK
+urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz"
-urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz"
+urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
-urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz"
+sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
-sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
 
-# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
 if uname -a |grep -q Darwin; then
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
+    urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz"
-    urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
+    urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz"
-    sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
+    urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz"
-
+    urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz"
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
+    sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa"
-    urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
+    sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7"
-    sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
+    node_js="$targetFolder/node-v$version_node-darwin-x64/bin"
-    pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
 else
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
+    urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz"
-    urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
+    urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
-    sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
+    urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz"
-
+    urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz"
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
+    sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
-    urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
+    sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
-    sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
+    node_js="$targetFolder/node-v$version_node-linux-x64/bin"
-    pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
 fi
 
 sudo mkdir "$targetFolder"
 
 InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" ""
+InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" ""
+InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
 
 sudo chmod -R a+rwx "$targetFolder"
 
 echo "Writing $targetFolder/.emscripten"
 cat <<EOM >"$targetFolder/.emscripten"
+LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
+EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
+BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
+NODE_JS='$node_js/node'
 EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
-LLVM_ROOT='$targetFolder/install/bin'
+SPIDERMONKEY_ENGINE = ''
-BINARYEN_ROOT='$targetFolder/install'
+V8_ENGINE = ''
-NODE_JS='$targetFolder/$pathNodeExecutable'
 TEMP_DIR = '/tmp'
+COMPILER_ENGINE = NODE_JS
+JS_ENGINES = [NODE_JS]
 EOM
 
-SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
+SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\""
 SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
 SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
 
 echo "Emsdk = $version" >> ~/versions.txt
+echo "Emsdk node = $version_node" >> ~/versions.txt

coin/provisioning/common/unix/squishInstall.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,120 +33,79 @@
 ##
 #############################################################################
 
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
 set -ex
 
-# This script will install squish package for Linux and Mac.
+# This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.5"
+version="6.5.2"
-# Branch version without dot
+qtBranch="514x"
-qtBranch="513x"
+installFolder="/opt"
-squishFolder="/opt/squish"
+squishFolder="$installFolder/squish"
-squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
+preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/.squish-3-license"
 if uname -a |grep -q Darwin; then
-     squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg"
+     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+     sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14"
+else
+     compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
+     sha1="63f33de55770e2588dd9f482546900e33d20f8ec"
 fi
 
-squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
+mountFolder="/tmp/squish"
-squishLicenseFile=".squish-3-license.tar.gz"
+sudo mkdir "$mountFolder"
 
-testSuite="suite_test_squish"
+# Check which platform
-testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
+if uname -a |grep -q Darwin; then
-
+    usersGroup="staff"
-# These checks can be removed when Vanilla OS for all linux and Mac are in
+    squishLicenseDir="/Users/qt"
-if [ -d "$squishFolder" ]; then
+elif uname -a |grep -q "el7"; then
-    echo "Move old squish to /tmp"
+    usersGroup="qt"
-    sudo mv "$squishFolder" "/tmp/squish_$(date)"
+    squishLicenseDir="/root"
+elif uname -a |grep -q "Ubuntu"; then
+    usersGroup="users"
+    squishLicenseDir="/home/qt"
+else
+    usersGroup="users"
+    squishLicenseDir="/root"
 fi
 
-if [ -f "/etc/profile.d/squish_env.sh" ]; then
+targetFileMount="$mountFolder"/"$compressedFolder"
-    echo "Remove /etc/profile.d/squish_env.sh"
+
-    sudo rm -f "/etc/profile.d/squish_env.sh"
+echo "Mounting $preBuildCacheUrl to $mountFolder"
-    export SQUISH_LICENSEKEY_DIR=$HOME
+sudo mount "$preBuildCacheUrl" "$mountFolder"
+echo "Create $installFolder if needed"
+if [ !  -d "$installFolder" ]; then
+    sudo mkdir "$installFolder"
 fi
 
-function MountAndInstall {
+VerifyHash "$targetFileMount" "$sha1"
-    url=$1
-    targetDirectory=$2
-    targetFile=$3
 
-    # Check which platform
+echo "Uncompress $compressedFolder"
-    if uname -a |grep -q Darwin; then
+sudo tar -xzf "$targetFileMount" --directory "$installFolder"
-        usersGroup="staff"
+
-        mountFolder="/Volumes"
+echo "Unmounting $mountFolder"
-        squishLicenseDir="/Users/qt"
+sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
-    elif uname -a |grep -q "el7"; then
+
-        usersGroup="qt"
+sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
-        mountFolder="/tmp"
+
-        squishLicenseDir="/root"
+if uname -a |grep -q "Ubuntu"; then
-    elif uname -a |grep -q "Ubuntu"; then
+    if [ ! -e "/usr/lib/tcl8.6" ]; then
-        usersGroup="users"
+        sudo mkdir /usr/lib/tcl8.6
-        mountFolder="/tmp"
+        sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
-        squishLicenseDir="/home/qt"
-    else
-        usersGroup="users"
-        mountFolder="/tmp"
-        squishLicenseDir="/root"
     fi
+fi
 
-    function UnMount {
+DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license"
-        echo "Unmounting $mountFolder"
-        sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
-    }
 
-    targetFileMount="$mountFolder"/"$targetFile"
+echo "Changing ownerships"
-
+sudo chown -R qt:$usersGroup "$squishFolder"
-    echo "Mounting $url to $mountFolder"
+sudo chown qt:$usersGroup "$HOME/.squish-3-license"
-    sudo mount "$url" "$mountFolder"
-    echo "Create $targetDirectory if needed"
-    if [ !  -d "/opt" ]; then
-        sudo mkdir "/opt"
-    fi
-    if [ !  -d "$targetDirectory" ]; then
-        sudo mkdir "$targetDirectory"
-    fi
-    echo "Uncompress $targetFile"
-    if [[ $targetFile == *.tar.gz ]]; then
-        if [[ $targetFile == .squish-3-license.* ]]; then
-            target="$squishLicenseDir"
-            # Squish license need to be exists also in users home directory, because squish check it before it starts running tests
-            sudo tar -xzf "$targetFileMount" --directory "$HOME"
-        else
-            target="$targetDirectory"
-        fi
-        sudo tar -xzf "$targetFileMount" --directory "$target"
-        UnMount
-    elif [[ $targetFile == *.dmg ]]; then
-        echo "'dmg-file', no need to uncompress"
-        sudo cp $targetFileMount /tmp
-        UnMount
-        sudo hdiutil attach "/tmp/$targetFile"
-        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null
-        mountFolder="/Volumes/froglogic Squish"
-        UnMount
-    elif [[ $targetFile == *.run ]]; then
-        echo "'run-file', no need to uncompress"
-        sudo cp $targetFileMount $targetDirectory
-        UnMount
-        sudo chmod +x $targetDirectory/$targetFile
-        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null
-        sudo rm -fr "$targetDirectory/$targetFile"
-        if uname -a |grep -q "Ubuntu"; then
-            sudo mkdir /usr/lib/tcl8.6
-            sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
-        fi
-    else
-        exit 1
-    fi
-
-    echo "Changing ownerships"
-    sudo chown -R qt:$usersGroup "$targetDirectory"
-    sudo chown qt:$usersGroup "$HOME/.squish-3-license"
-}
 
 echo "Set commands for environment variables in .bashrc"
-
 if uname -a |grep -q "Ubuntu"; then
     echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
     echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
@@ -155,19 +114,11 @@ else
     echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
 fi
 
-echo "Installing squish license to home directory.."
+echo "Verifying Squish"
-MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
+if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-
-echo "Installing squish $version.."
-MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
-
-echo "Installing provisioning scripts for squish"
-MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"
-
-echo "Verifying Squish Installation"
-if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then
     echo "Squish installation tested successfully"
 else
     echo "Squish test failed! Package wasn't installed correctly."
     exit 1
 fi
+

coin/provisioning/common/windows/conan.ps1

@@ -77,20 +77,27 @@ function Run-Conan-Install
     $manifestsDir = "$PSScriptRoot\conan_manifests"
     $buildinfoRoot = "C:\Utils\conanbuildinfos"
 
-    # Make up to 5 attempts for all download operations in conan
-    $env:CONAN_RETRY = "5"
-
     Get-ChildItem -Path "$ConanfilesDir\*.txt" |
     ForEach-Object {
         $conanfile = $_.FullName
         $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)"
         New-Item $outpwd -Type directory -Force | Out-Null
 
-        Push-Location $outpwd
+        for ($i = 1; $i -le 5; $i++) {
-        Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", `
+            try {
-            '-s', ('compiler="' + $Compiler + '"'), `
+                Push-Location $outpwd
-            "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile"
+                Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", `
-        Pop-Location
+                    '-s', ('compiler="' + $Compiler + '"'), `
+                    "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile"
+                break;
+            } catch {
+                if ($i -eq 5) {
+                    throw "Could not install conan content"
+                }
+            } finally {
+                Pop-Location
+            }
+        }
 
         Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
     }

coin/provisioning/common/windows/emsdk.ps1

@@ -35,38 +35,33 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "1.39.8"
+$version = "1.38.27"
-$versionNode = "12.9.1"
+$versionNode = "8.9.1"
-$versionWinPython = "3.7.4"
+$versionWinPython = "2.7.13"
 $versionJre = "8_update_152"
 
-$urlEmscripten = "https://storage.googleapis.com/webassembly/emscripten-releases-builds"
+$urlOfficialMozilla = "https://s3.amazonaws.com/mozilla-games/emscripten/packages"
-
-# cross-platform emscripten SDK
-$urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.zip"
 $urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk"
 
-$urlEmscriptenCache="$urlCache/emscripten.$version.zip"
+$urlOfficialEmscriptenLlvm = "$urlOfficialMozilla/llvm/tag/win_64bit/emscripten-llvm-e$version.zip"
+$urlCacheEmscriptenLlvm = "$urlCache/windows/emscripten-llvm-e$version.zip"
+$sha1EmscriptenLlvm = "1cd950feec50f1f3265f04ab01fb270250eb4232"
 
-$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip"
+$urlOfficialNode = "$urlOfficialMozilla/node-v$versionNode-win-x64.zip"
-$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip"
-$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603"
-
-$urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip"
 $urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip"
-$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D"
+$sha1Node = "249c840f7b953e4cb7ac9db89aa92a98daa1dc63"
 
-$urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip"
+$urlOfficialWinPython = "$urlOfficialMozilla/WinPython-64bit-$versionWinPython.1Zero.zip"
-$urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip"
+$urlCacheWinPython = "$urlCache/windows/WinPython-64bit-$versionWinPython.1Zero.zip"
-$sha1WinPython = "27C5A465390167FC03F3DD9075E3FDAAD9FBE104"
+$sha1WinPython = "7e5a021878e0165ba0603e995b013e244d6e10cb"
 
-$urlOfficialProtableJre = "$urlEmscripten/deps/portable_jre_${versionJre}_64bit.zip"
+$urlOfficialProtableJre = "$urlOfficialMozilla/portable_jre_${versionJre}_64bit.zip"
 $urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip"
 $sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2"
 
 $urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip"
 $urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip"
-$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE"
+$sha1Emscripten = "22d78a0af48b50271ab183fd3d8ea2f9ba311ee7"
 
 $installLocationEmsdk = "C:\\Utils\\emsdk"
 $temp = "C:\Windows\Temp"
@@ -89,33 +84,35 @@ function Install {
 
 New-Item -ItemType directory -Force -Path "$installLocationEmsdk"
 
-Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\wasm-binaries.$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version"
+Install $urlOfficialEmscriptenLlvm $urlCacheEmscriptenLlvm $sha1EmscriptenLlvm "$temp\emscripten-llvm-e$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version"
 Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk"
-Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched"
+Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\WinPython-64bit-$versionWinPython.1Zero.zip" "$installLocationEmsdk"
 Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk"
 Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk"
 
 cd $installLocationEmsdk
-"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII
+"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version'" | Out-File '.emscripten' -Encoding ASCII
-"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII
+"EMSCRIPTEN_NATIVE_OPTIMIZER='$installLocationEmsdk\\emscripten-llvm-e$version\\optimizer'" | Out-File '.emscripten' -Append -Encoding ASCII
-"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
+"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\binaryen'" | Out-File '.emscripten' -Append -Encoding ASCII
-"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
+"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node'" | Out-File '.emscripten' -Append -Encoding ASCII
-"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII
+"EMSCRIPTEN_ROOT='$installLocationEmsdk\emscripten-$version'" | Out-File '.emscripten' -Append -Encoding ASCII
-"JAVA='$installLocationEmsdk\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII
+"SPIDERMONKEY_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII
+"V8_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII
 "TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII
 "COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII
 "JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII
 
 Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk"
 Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten"
-Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin"
+Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version"
-Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\"
+Set-EnvironmentVariable "EMSCRIPTEN_NATIVE_OPTIMIZER" "$installLocationEmsdk\emscripten-llvm-e$version\optimizer.exe"
+Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\binaryen"
 Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe"
-Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\python.exe"
+Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64\python.exe"
 Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64"
 Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version"
-Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten"
+Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-$version"
-Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin"
+Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-$version;$installLocationEmsdk;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version;$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64;$installLocationEmsdk\java64\bin"
 
 Write-Output "emsdk = $version" >> ~/versions.txt
 Write-Output "emsdk llvm = $version" >> ~/versions.txt

coin/provisioning/common/windows/install-msys2.ps1

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -61,16 +61,8 @@ Extract-tar_gz $PackagePath $TargetLocation
 $msys = "$TargetLocation\$folder\msys2_shell.cmd"
 
 # install perl
-# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
+Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
-cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
+Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
-Start-Sleep -s 30
-cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
-
-# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
-# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
-Start-Sleep -s 180
-if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
-if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
 
 Write-Host "Cleaning $PackagePath.."
 Remove-Item -Recurse -Force -Path "$PackagePath"

coin/provisioning/common/windows/squishInstall.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,120 +33,48 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script will install squish package for Windows.
+# This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
-# NOTE! Make sure 64bit versions are always installed before 32bit,
-# because they use same folder name before a rename
-
-$version = "6.5"
-
-# Qt branch without dot (*.*)
-$qtBranch = "513x"
-# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
-# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
 
+$version = "6.5.2"
+$qtBranch = "514x"
 $targetDir = "C:\Utils\squish"
-$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
+$squishPackage = "C:\Utils\rta_squish"
-$squishBranchUrl = "$squishUrl\$qtBranch"
+$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build"
-$testSuite = "suite_test_squish"
+$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
-$testSuiteUrl = "$squishUrl\$testSuite.7z"
 
 # Squish license
 $licensePackage = ".squish-3-license"
 
+Write-Host "Installing Squish license to home directory"
+Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
+
+if (Is64BitWinHost) {
+     $arch = "x64"
+} else {
+    $arch = "x86"
+}
+
 $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
 
-Function DownloadAndInstallSquish {
-    Param (
-        [string]$version,
-        [string]$bit,
-        [string]$squishPackage
-    )
-    $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
-    $SquishInstaller = "$targetDir\$squishPackage.exe"
-    $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
-
-    Write-Host "Fetching from URL $squishUrl"
-    Copy-Item "$SquishUrl" "$SquishInstaller"
-    Write-Host "Installing Squish"
-    $stdoutFile = [System.IO.Path]::GetTempFileName()
-    $stderrFile = [System.IO.Path]::GetTempFileName()
-    Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null
-    Remove-Item -Path $SquishInstaller
-    if ("$bit" -eq "win64") {
-        if ($squishPackage.StartsWith("mingw")) {
-            $squishPackage64bit = "mingw_64"
-        } else {
-            $squishPackage64bit = "$squishPackage`_64"
-        }
-        Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
-        TestSquish $squishPackage64bit
-    } else {
-        if ($squishPackage.StartsWith("mingw")) {
-            Rename-Item $targetDir\$squishPackage $targetDir\mingw
-            TestSquish mingw
-        } else {
-            TestSquish $squishPackage
-        }
-    }
-}
-
-Function DownloadSquishLicence {
-    Param (
-        [string]$squishUrl
-    )
-
-    Write-Host "Installing Squish license to home directory"
-    Copy-Item $squishUrl\$licensePackage ~\$licensePackage
-}
-
-Function TestSquish {
-    Param (
-        [string]$squishPackage
-    )
-
-    Write-Host "Verifying Squish Installation"
-    if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") {
-        Write-Host "Squish installation tested successfully!"
-    } else {
-        Write-Host "Squish test failed! $squishPackage wasn't installed correctly."
-        [Environment]::Exit(1)
-    }
-}
-
-Write-Host "Creating $targetDir"
-New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
-
-Write-Host "Download and install Test Suite for squish"
-Copy-Item $testSuiteUrl $targetDir/$testSuite.7z
-Extract-7Zip $targetDir/$testSuite.7z $targetDir
-
-DownloadSquishLicence $squishUrl
-
 if ($OSVersion -eq "Windows 10 Enterprise") {
-
+    $winVersion = "win10"
     if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc14"
+        $sha1 = "9262d3b749483094024c74986f93e9340afbdb62"
-        DownloadAndInstallSquish $version win64 "msvc141"
-        DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
     } else {
-        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+        $sha1 = "0763b344afa327e6c374971492021c5e923be892"
     }
-    DownloadAndInstallSquish $version win32 "msvc141"
-
-} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
-
-    if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc14"
-    }
-    DownloadAndInstallSquish $version win32 "msvc141"
-
 } elseif ($OSVersion -eq "Windows 7 Enterprise") {
-
+    $winVersion = "win7"
-    if (Is64BitWinHost) {
+    $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d"
-        DownloadAndInstallSquish $version win64 "msvc14"
-    } else {
-        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
-    }
-    DownloadAndInstallSquish $version win32 "msvc141"
 }
+$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
+
+Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils"
+Verify-Checksum "C:\Utils\$squishArchive" $sha1
+Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
+Rename-Item "$squishPackage" "$targetDir"
+
+Write-Host "Verifying Squish Installation for following targets:"
+get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName }
+get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } }

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

@@ -169,8 +169,6 @@ installPackages+=(git-lfs)
 installPackages+=(chrpath)
 installPackages+=(gawk)
 installPackages+=(texinfo)
-# Needed for Poppler test in QtWebEngine
-installPackages+=(libpoppler-cpp-dev)
 # Needed for qtwebkit
 installPackages+=(ruby)
 installPackages+=(libxslt1-dev)

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh

@@ -5,4 +5,4 @@ set -ex
 # shellcheck source=../common/linux/gcc.sh
 source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
 
-InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153
+InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2

coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh

@@ -5,7 +5,7 @@
 
 set -ex
 
-sudo zypper -nq install python-devel python-xml
+sudo zypper -nq install python-devel python-virtualenv
 
 # install python3
 sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel

coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Install pkgconfig
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/pkgconfig.sh"

coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Install libusb
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/libusb.sh"

coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
 { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
 
-iPhoneDeveloper="iosDevelopment2019CiTeam.p12"
+iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
-shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc"
+shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
-Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
 { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
 
-iPhoneDistribution="iosDistribution2019CiTeam.p12"
+iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
-shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9"
+shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
-Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
 { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
 
@@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.."
 echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
 mkdir "$targetFolder/Library/MobileDevice"
 mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
-shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb"
+shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
-Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
+Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
 
 # Removing password files
 rm -fr "$targetFolder/login_keychain_password.txt"

coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
 { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
 
-iPhoneDeveloper="iosDevelopment2019CiTeam.p12"
+iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
-shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc"
+shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
-Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
 { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
 
-iPhoneDistribution="iosDistribution2019CiTeam.p12"
+iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
-shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9"
+shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
-Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
 { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
 
@@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.."
 echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
 mkdir "$targetFolder/Library/MobileDevice"
 mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
-shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb"
+shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
-Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
+Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
 
 # Removing password files
 rm -fr "$targetFolder/login_keychain_password.txt"

coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1"

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1

@@ -1,11 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install MinGW 8.1.0
-
-$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0"
-$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb"
-$suffix = "_i686"
-
-InstallMinGW $release $sha1 $suffix
-
-

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1

@@ -1,10 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install 64-bit MinGW 8.1.0
-
-$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0"
-
-$sha1    = "5aa456654a6ce77249c27888b5d0f856fc011b9c"
-
-InstallMinGW $release $sha1
-

coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1

@@ -1,11 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install MinGW 8.1.0
-
-$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0"
-$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb"
-$suffix = "_i686"
-
-InstallMinGW $release $sha1 $suffix
-
-