Update submodules on '5.15' in qt/qt5

Change-Id: If1114ea254b242d6b0f5e0dbdb1bd66155716f31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

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

coin/platform_configs/default.yaml

@@ -5,52 +5,52 @@ Configurations:
     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%'
+    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: 'Mingw73'
-    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++'
+    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-16'
     Target arch: 'x86'
     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%'
+    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'
     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%'
+    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%'
+    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-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'
+    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 -qt-zlib'
 -
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-10-x86_64-16'
     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%'
+    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%'
+    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'
@@ -58,12 +58,7 @@ Configurations:
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
-    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'
+    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'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
@@ -94,7 +89,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 -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'
+    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'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Compiler: 'Clang'
@@ -103,7 +98,6 @@ Configurations:
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
-    Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
 -
     Template: 'qtci-macos-10.14-x86_64'
@@ -117,20 +111,6 @@ 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/qt5.yaml

@@ -3,37 +3,37 @@
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'x86'
     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-msvc2017 -xplatform winrt-x86-msvc2017'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-7-x86-3'
     Compiler: 'Mingw73'
     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'
+    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-16'
     Compiler: 'Mingw73'
     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'
+    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-16'
     Target os: 'WinRT_10'
     Target arch: 'armv7'
     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-msvc2017 -xplatform winrt-arm-msvc2017'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     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-msvc2017 -xplatform winrt-x64-msvc2017'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'Android_ANY'
@@ -41,7 +41,7 @@
     Compiler: 'Mingw73'
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'Android_ANY'
@@ -63,21 +63,21 @@
     Target arch: 'armv7'
     Compiler: 'Mingw73'
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'armv8'
     Compiler: 'Mingw73'
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'x86_64'
     Compiler: 'Mingw73'
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-linux-RHEL-7.6-x86_64'
     Target os: 'QNX_700'
@@ -97,7 +97,7 @@
     Target os: 'WebAssembly'
     Compiler: 'Mingw73'
     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'
+    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 -qt-zlib'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'WebAssembly'

coin/provisioning/common/linux/android_linux.sh

@@ -37,6 +37,8 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
+set -e
+
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/check_and_set_proxy.sh
@@ -80,8 +82,11 @@ else
     sudo chown -R qt:users "$targetFolder"
 fi
 
-# Run the following command under `eval` or `sh -c` so that the shell properly splits it
+# Stop the sdkmanager from printing thousands of lines of #hashmarks.
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it.
 sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
+# But don't let the pipeline hide sdkmanager failures.
+set -o pipefail
 
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
 # shellcheck disable=SC2031

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" \
-                                           --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
-                                           --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
-                                           --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
+        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/cc cc "$installPrefix/bin/gcc${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/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/c++ c++ "$installPrefix/bin/g++-$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/cc cc "$installPrefix/bin/gcc${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/linux/version.sh

@@ -41,3 +41,9 @@ echo "*********************************************"
 echo "***** SW VERSIONS *****"
 cat ~/versions.txt
 echo "*********************************************"
+echo "*************** mount ***********************"
+mount
+echo "*********************************************"
+echo "*************** df **************************"
+df -hT
+echo "*********************************************"

coin/provisioning/common/macos/InstallPKGFromURL.sh

@@ -42,7 +42,9 @@ function InstallPKGFromURL {
     targetDirectory=$4
 
     echo "Creating temporary file"
-    targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg")
+    package_basename=$(echo "$url" | sed 's|^.*/||')
+    tmpdir=$(mktemp -d)
+    targetFile="$tmpdir/$package_basename"
     echo "Downloading PKG from primary URL '$url'"
     curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
         echo "Failed to download '$url' multiple times"
@@ -50,10 +52,12 @@ function InstallPKGFromURL {
         curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
     )
     echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
-    /usr/bin/shasum --check "$targetFile.sha1"
+    echo "$expectedSha1 *$targetFile" > "$targetFile".sha1
+    /usr/bin/shasum --check "$targetFile".sha1
     echo "Run installer on PKG"
     sudo installer -package "$targetFile" -target "$targetDirectory"
-    echo "Removing file '$targetFile'"
-    rm "$targetFile"
+
+    rm -f  "$targetFile".sha1
+    rm -f  "$targetFile"
+    rmdir  "$tmpdir"
 }

coin/provisioning/common/macos/homebrew.sh

@@ -1,12 +1,21 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 
 # Will install homebrew package manager for macOS.
 #     WARNING: Requires commandlinetools
 
-# TODO audit and cache this file locally, see QTQAINFRA-3134
-curl -L -o /tmp/homebrew_install  https://raw.githubusercontent.com/Homebrew/install/master/install
 
+set -e
+
+. "$(dirname "$0")"/../../common/unix/DownloadURL.sh
+
+
+DownloadURL  \
+    http://ci-files01-hki.intra.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb  \
+    https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install  \
+    b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a  \
+    /tmp/homebrew_install
 /usr/bin/ruby /tmp/homebrew_install  </dev/null
 
-brew update
+# No need to manually do `brew update`, the homebrew installer script does it.
+### brew update

coin/provisioning/common/macos/telegraf-coin.conf

@@ -24,7 +24,13 @@
 #  collect_cpu_time = false
 #  report_active = false
 [[inputs.disk]]
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
+  # macOS needs two extra filesystem exceptions:
+  # + cd9660:  This is a read-only filesystem, and always 100% full
+  # + msdos:   Sometimes at boot a short-lived unique mount of type "msdos"
+  #            is performed, at the random directory
+  #            /Volumes/firmwaresyncd.XXXXXX.
+  #            The uniqueness of the path bloats the cardinality of InfluxDB.
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs", "cd9660", "msdos"]
 #[[inputs.diskio]]    # linux-only
 [[inputs.kernel]]
 [[inputs.mem]]

coin/provisioning/common/macos/version.sh

@@ -41,3 +41,9 @@ echo "*********************************************"
 echo "***** SW VERSIONS *****"
 cat ~/versions.txt
 echo "*********************************************"
+echo "*************** mount ***********************"
+mount
+echo "*********************************************"
+echo "*************** df **************************"
+df -h
+echo "*********************************************"

coin/provisioning/common/shared/requirements.txt

@@ -9,7 +9,7 @@ argh==0.26.2
 click==6.7
 coloredlogs==10.0
 humanfriendly==4.15.1
-Jinja2==2.10
+Jinja2==2.10.3
 MarkupSafe==1.0
 path.py==11.0.1
 pathtools==0.1.2

coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt

@@ -1,6 +1,4 @@
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_i386.zip            d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_amd64.zip           88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_darwin_amd64.tar.gz         58a2b294c1b6408c396b5526719cf7cad557f7075fed10ff0b2a74141ea2d629
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_amd64.tar.gz          070a76800d1a5f33413b8948286f75caa55ebd924f6fb6996a753b9979799ef5
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_i386.tar.gz           964077b6846708f579a100d7ea6090e2d8350ace75ec735d539bc452bc551038
-https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1-static_linux_amd64.tar.gz   bb03814c99c037ce0758e3884660910f2f6fd78f3d49a8e1ef531693b3cfe25d
+https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_darwin_amd64.tar.gz         2bc056e1ad38af2ba95d2cb1d43b513cc611fdd3b851b2ff5e09991d52b01253
+https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_linux_amd64.tar.gz          b33cf0f5935a5c225ab0de69db1e6b249d581f3213313de62a8de928aedadbec
+https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_windows_amd64.zip           5d025d85070e8c180c443580afa8a27421a7bbcf14b5044894e9f3298d0ce97a
+https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_windows_i386.zip            5178a0bdaab448c2ef965b0e36f835849cea731ccd87c4a4527f0f05fbbdf271

coin/provisioning/common/unix/DownloadURL.sh

@@ -39,10 +39,12 @@
 # based on the SHA length). Target filename should also be given.
 
 ############################ BOILERPLATE ###############################
-command -v sha1sum >/dev/null   ||  alias   sha1sum='shasum -a 1'
-command -v sha256sum >/dev/null ||  alias sha256sum='shasum -a 256'
-command -v sha384sum >/dev/null ||  alias sha384sum='shasum -a 384'
-command -v sha512sum >/dev/null ||  alias sha512sum='shasum -a 512'
+
+command -v sha1sum   >/dev/null ||  sha1sum   () { shasum -a 1   "$@" ; }
+command -v sha256sum >/dev/null ||  sha256sum () { shasum -a 256 "$@" ; }
+command -v sha384sum >/dev/null ||  sha384sum () { shasum -a 384 "$@" ; }
+command -v sha512sum >/dev/null ||  sha512sum () { shasum -a 512 "$@" ; }
+
 ########################################################################
 
 
@@ -98,20 +100,27 @@ DownloadURL () {
         targetFile=$4
     fi
 
-    if VerifyHash "$targetFile" "$expectedHash"
+    # If a non-empty file already exists
+    if [ -s "$targetFile" ]
     then
-        echo "Skipping download, found and validated existing file:  $targetFile"
-    else
-        echo "Downloading from primary URL:  $url"
-        if  ! Download "$url" "$targetFile"
+        if   VerifyHash "$targetFile" "$expectedHash"
         then
-            echo "FAIL! to download, trying alternative URL:  $url2"  1>&2
-            if  ! Download "$url2" "$targetFile"
-            then
-                echo 'FAIL! to download even from alternative URL'  1>&2
-                return 1
-            fi
+            echo "Skipping download, found and validated existing file:  $targetFile"
+            return
+        else
+            echo "WARNING: Non-empty but different file found at destination; will re-download and overwrite file:  $targetFile"
         fi
-        VerifyHash "$targetFile" "$expectedHash"
     fi
+
+    echo "Downloading from primary URL:  $url"
+    if  ! Download "$url" "$targetFile"
+    then
+        echo "FAIL! to download, trying alternative URL:  $url2"  1>&2
+        if  ! Download "$url2" "$targetFile"
+        then
+            echo 'FAIL! to download even from alternative URL'  1>&2
+            return 1
+        fi
+    fi
+    VerifyHash "$targetFile" "$expectedHash"
 }

coin/provisioning/common/unix/libclang.sh

@@ -65,10 +65,10 @@ zip="/tmp/libclang.7z"
 destination="/usr/local/libclang-$version"
 
 DownloadURL $url_cached $url $sha1 $zip
-7z x $zip -o/tmp/
+sudo 7z x $zip -o/usr/local/
+sudo mv /usr/local/libclang "$destination"
 rm -rf $zip
 
-sudo mv /tmp/libclang "$destination"
 
 echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
 echo "libClang = $version" >> ~/versions.txt

coin/provisioning/common/unix/telegraf_install.sh

@@ -73,7 +73,7 @@ $CMD_INSTALL -m 755  "$PROVISIONING_DIR"/common/shared/telegraf/telegraf-ioping.
 
 [ x"$PROVISIONING_OS"   = xmacos ] && os=darwin || os=linux
 [ x"$PROVISIONING_ARCH" = xx86   ] && arch=i386 || arch=amd64
-package_filename=telegraf-1.12.1_${os}_${arch}.tar.gz
+package_filename=telegraf-1.12.6_${os}_${arch}.tar.gz
 package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt
 package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list")
 

coin/provisioning/common/windows/android.ps1

@@ -95,9 +95,12 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
 # Get a PATH where Java's path is defined from previous provisioning
 [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
 
+# Attempt to catch all errors of sdkmanager.bat, even when hidden behind a pipeline.
+$ErrorActionPreference = "Stop"
+
 cd $toolsFolder\bin\
 $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
-$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
+$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args | Out-Null'
 Invoke-Expression $command
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
 iex $command

coin/provisioning/common/windows/install_telegraf.ps1

@@ -37,14 +37,14 @@
 # Install a specific version of Telegraf
 # https://github.com/influxdata/telegraf/releases
 
-$version = "1.12.1"
+$version = "1.12.6"
 
 if (Is64BitWinHost) {
     $arch = "amd64"
-    $sha256 = "88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29"
+    $sha256 = "5d025d85070e8c180c443580afa8a27421a7bbcf14b5044894e9f3298d0ce97a"
 } else {
     $arch = "i386"
-    $sha256 = "d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837"
+    $sha256 = "5178a0bdaab448c2ef965b0e36f835849cea731ccd87c4a4527f0f05fbbdf271"
 }
 
 $filename = "telegraf-" + $version + "_windows_" + $arch + ".zip"

coin/provisioning/common/windows/postgresql.ps1

@@ -58,6 +58,7 @@ if (Is64BitWinHost) {
     Remove-Item -Path $packagex64
     # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
     Remove-item -Path "$installFolder\pgsql\include\pthread.h"
+    Remove-item -Path "$installFolder\pgsql\include\unistd.h"
 
     Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
     Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"
@@ -85,6 +86,7 @@ Write-Host "Remove downloaded $packagex86 ..."
 Remove-Item -Path $packagex86
 # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
 Remove-item -Path "$installFolder\pgsql\include\pthread.h"
+Remove-item -Path "$installFolder\pgsql\include\unistd.h"
 
 Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
 Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"

coin/provisioning/common/windows/version.ps1

@@ -0,0 +1,6 @@
+Write-Host '******************** SW VERSIONS ********************'
+type ~/versions.txt
+Write-Host '*****************************************************'
+Write-Host '******************** Get-PSDrive ********************'
+Get-PSDrive
+Write-Host '*****************************************************'

coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.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.
@@ -115,6 +115,13 @@ installPackages+=(unixODBC-devel)
 installPackages+=(unixODBC)
 # Vulkan support
 installPackages+=(vulkan-devel)
+# Conan: For Python build
+installPackages+=(xz-devel)
+installPackages+=(zlib-devel)
+installPackages+=(libffi-devel)
+installPackages+=(libsqlite3x-devel)
+# Build.pl
+installPackages+=(perl-Data-Dumper)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh

@@ -59,10 +59,12 @@ echo 'export DISPLAY=":0"' >> ~/.bashrc
 
 sudo systemctl stop packagekit
 sudo systemctl disable packagekit
+sudo systemctl mask packagekit
 while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do
     echo "Waiting for PackageKit to finish..."
     sleep 5
 done
+sudo zypper -nq remove gnome-software
 
 # shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then

coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

@@ -35,7 +35,9 @@
 
 set -ex
 
-sudo zypper -nq install git gcc gcc-c++
+sudo zypper -nq install elfutils binutils
+
+sudo zypper -nq install git gcc gcc-c++ make patch wget tar
 
 sudo zypper -nq install bison flex gperf \
         zlib-devel \

coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh

@@ -39,13 +39,57 @@
 
 set -ex
 
-sudo zypper -nq install python-devel
+PROVISIONING_DIR="$(dirname "$0")/../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
 
-wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
-bash build_python3.sh
 
-export
-python3 --version
+# Python 2
+$CMD_PKG_INSTALL python-devel
+
+# Selected installation instructions coming from:
+# https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
+export PACKAGE_NAME="python"
+export PACKAGE_VERSION="3.7.6"
+export PACKAGE_SHA=55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f
+(
+
+    $CMD_PKG_INSTALL  ncurses zlib-devel libffi-devel libopenssl-devel
+
+    echo 'Configuration and Installation started'
+
+    #Download Source code
+    DownloadURL  \
+        http://ci-files01-hki.intra.qt.io/input/python/Python-${PACKAGE_VERSION}.tar.xz  \
+        https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz  \
+        $PACKAGE_SHA
+    tar -xf "Python-${PACKAGE_VERSION}.tar.xz"
+
+    #Configure and Build
+    cd "Python-${PACKAGE_VERSION}"
+    ./configure --prefix=/usr/local --exec-prefix=/usr/local
+    make
+    sudo make install
+
+    echo 'Installed python successfully'
+
+    #Cleanup
+    cd -
+    rm "Python-${PACKAGE_VERSION}.tar.xz"
+
+    #Verify python installation
+    export PATH="/usr/local/bin:${PATH}"
+    if command -V "$PACKAGE_NAME"${PACKAGE_VERSION:0:1} >/dev/null
+    then
+        printf -- "%s installation completed. Please check the Usage to start the service.\n" "$PACKAGE_NAME"
+    else
+        printf -- "Error while installing %s, exiting with 127 \n" "$PACKAGE_NAME"
+        exit 127
+    fi
+)
+
+
+python3 --version | fgrep "$PACKAGE_VERSION"
 
 pip3 install --user wheel
 pip3 install --user virtualenv

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh

@@ -57,6 +57,9 @@ echo "Setting up workaround for Ubuntu systemd resolve bug"
 sudo rm -f /etc/resolv.conf
 sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
 
+# remove hostname to get unique based on IP address
+sudo rm /etc/hostname
+
 echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
 echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 

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

@@ -169,6 +169,8 @@ installPackages+=(git-lfs)
 installPackages+=(chrpath)
 installPackages+=(gawk)
 installPackages+=(texinfo)
+# Needed for Poppler test in QtWebEngine
+installPackages+=(libpoppler-cpp-dev)
 
 echo "Running update for apt"
 waitLoop

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.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2
+InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153

coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh

@@ -23,6 +23,9 @@ echo 'export DISPLAY=":0"' >> ~/.bashrc
 echo "Disabling file indexing."
 sudo balooctl disable
 
+sudo systemctl stop packagekit
+sudo systemctl disable packagekit
+sudo systemctl mask packagekit
 while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do
     echo "Waiting for PackageKit to finish..."
     sleep 0.5

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

@@ -5,11 +5,10 @@
 
 set -ex
 
-sudo pkcon -y refresh
-sudo pkcon -y install python-devel python-virtualenv
+sudo zypper -nq install python-devel python-virtualenv
 
 # install python3
-sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
+sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
 
 # Install all needed packages in a special wheel cache directory
 pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"

coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh

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

coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

@@ -37,7 +37,7 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
-set -ex
+set -e
 
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
@@ -68,8 +68,16 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
 echo "Changing ownership of Android files."
 sudo chown -R qt:wheel "$targetFolder"
 
+# Stop the sdkmanager from printing thousands of lines of #hashmarks.
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it.
+sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
+# But don't let the pipeline hide sdkmanager failures.
+set -o pipefail
+
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
-(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+(echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager"  \
+    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+    | eval $sdkmanager_no_progress_bar_cmd
 
 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"

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

@@ -96,8 +96,8 @@ Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
 chmod 755 "$csreq"
 
 # iOS signing tools
-devIDKeychain="Developer_ID_TheQtCompany.keychain"
-shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca"
+devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
+shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
 Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
 echo "Opening $devIDKeychain.."
 open "$keychains/$devIDKeychain"

coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh

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

coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh

@@ -68,8 +68,13 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
 echo "Changing ownership of Android files."
 sudo chown -R qt:wheel "$targetFolder"
 
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it
+sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
+
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
-(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+(echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager"  \
+    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+    | eval $sdkmanager_no_progress_bar_cmd
 
 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"

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

@@ -96,8 +96,8 @@ Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
 chmod 755 "$csreq"
 
 # iOS signing tools
-devIDKeychain="Developer_ID_TheQtCompany.keychain"
-shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca"
+devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
+shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
 Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
 echo "Opening $devIDKeychain.."
 open "$keychains/$devIDKeychain"

coin/provisioning/qtci-windows-10-x86/99-version.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\version.ps1"

coin/provisioning/qtci-windows-10-x86_64/99-version.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\version.ps1"

coin/provisioning/qtci-windows-7-x86/99-version.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\version.ps1"

coin/provisioning/qtci-windows-7-x86_64/99-version.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\version.ps1"

coin/provisioning/qtci-windows-8.1-x86/99-version.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\version.ps1"

coin/provisioning/qtci-windows-8.1-x86_64/99-version.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\version.ps1"