ogl-runtime: instead of linking to qt5.txt use the actual configuration

Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

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

_clang-format

@@ -13,9 +13,10 @@ BasedOnStyle: WebKit
 
 Standard: Cpp11
 
-# Leave the line breaks up to the user.
+# Column width is limited to 100 in accordance with Qt Coding Style.
+# https://wiki.qt.io/Qt_Coding_Style
 # Note that this may be changed at some point in the future.
-ColumnLimit: 0
+ColumnLimit: 100
 # How much weight do extra characters after the line length limit have.
 # PenaltyExcessCharacter: 4
 
@@ -77,4 +78,5 @@ SortIncludes: false
 # macros for which the opening brace stays attached.
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
 
-
+# Break constructor initializers before the colon and after the commas.
+BreakConstructorInitializers: BeforeColon

coin/platform_configs/default.txt

@@ -1,27 +1,28 @@
-Template                            Target OS           Target arch Compiler    Target Compiler Features
+Template                            Target OS           Target arch Compiler    Target Compiler Features                             Configure arguments
------------------------------------ ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
+----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-10-x86_64-10                                           MSVC2015                                                         -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%
-qtci-windows-7-x86-3                                                Mingw73                     DeveloperBuild Release OpenGLDynamic
+qtci-windows-7-x86-3                                                Mingw73                                                          -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++
-qtci-windows-10-x86_64-10                               x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                               x86         MSVC2017                    Packaging                            -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%
-qtci-windows-10-x86_64-10                                           MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                           MSVC2015                    Packaging                            -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%
-qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015                    Packaging DisableTests               -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
-qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015                    Packaging DisableTests               -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
-qtci-windows-10-x86_64-10                                           MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                           MSVC2017                    Packaging                            -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%
-qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC                         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC                                                              -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
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-18.04-x86_64                                      GCC                                                              -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
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
+qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         OutOfSourceBuild Documentation       -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
-qtci-linux-openSUSE-42.3-x86_64                                     GCC                         DeveloperBuild NoPch
+qtci-linux-openSUSE-42.3-x86_64                                     GCC                                                              -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
-qtci-linux-openSUSE-42.3-x86_64                                     ICC_18                      DeveloperBuild NoPch DisableTests SystemSQLite
+qtci-linux-openSUSE-42.3-x86_64                                     ICC_18                      DisableTests                         -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
-qtci-linux-RHEL-7.4-x86_64                                          GCC                         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
+qtci-linux-openSUSE-42.3-x86_64     WebAssembly                     GCC                         Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten
-qtci-macos-10.13-x86_64-2                                           Clang                       Packaging DebugAndRelease Release
+qtci-linux-RHEL-7.4-x86_64                                          GCC                         Packaging                            -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
-qtci-macos-10.12-x86_64-9                                           Clang                       DeveloperBuild NoFramework Release QtNamespace NoPch
+qtci-macos-10.13-x86_64-2                                           Clang                       Packaging                            -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 -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include
-qtci-macos-10.13-x86_64-2           IOS_ANY             multi       Clang                       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.12-x86_64-9                                           Clang                                                            -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include
-qtci-macos-10.13-x86_64-2           TvOS_ANY            multi       Clang                       DebugAndRelease DisableTests
+qtci-macos-10.13-x86_64-2           IOS_ANY             multi       Clang                       Packaging DisableTests               -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
-qtci-macos-10.13-x86_64-2           WatchOS_ANY         multi       Clang                       DebugAndRelease DisableTests
+qtci-macos-10.13-x86_64-2           TvOS_ANY            multi       Clang                       DisableTests                         -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
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.13-x86_64-2           WatchOS_ANY         multi       Clang                       DisableTests                         -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
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       Clang       Clang           Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                armv7       GCC                         Release
+qtci-linux-RHEL-7.4-x86_64          Android_ANY         arm64       Clang       Clang           Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                arm64       GCC                         Release
+qtci-linux-Ubuntu-18.04-x86_64      QEMU                armv7       GCC                                                              -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib
+qtci-linux-Ubuntu-18.04-x86_64      QEMU                arm64       GCC                                                              -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
 qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         TestOnly LicenseCheck
-qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC                         DisableTests                         -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6
-qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC                         Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc

coin/platform_configs/ogl-runtime.txt

@@ -0,0 +1,21 @@
+Template                    Target OS           Target arch Compiler    Target Compiler Features                   Configure arguments
+--------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x86-msvc2017
+qtci-windows-7-x86-3                                        Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -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++
+qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -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++
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-arm-msvc2017
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -platform win32-msvc2017 -xplatform winrt-x64-msvc2017
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86
+qtci-windows-10-x86_64-10   Android_ANY         armv7       Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -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-r19c -android-arch armeabi-v7a
+qtci-windows-10-x86_64-10   Android_ANY         arm64       Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -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-r19c -android-arch arm64-v8a
+qtci-windows-10-x86_64-10   Android_ANY         x86         Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -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-r19c -android-arch x86
+qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a
+qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a
+qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86
+qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         DisableTests               -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-armle-v7-qcc
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -xplatform qnx-aarch64le-qcc
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl es2 -xplatform qnx-x86-64-qcc
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc

coin/platform_configs/qt3d-runtime.txt

@@ -1,22 +1 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features
+qt5.txt
---------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qt5.txt

@@ -1,22 +1,21 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features
+Template                    Target OS           Target arch Compiler    Target Compiler Features                   Configure arguments
---------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
+--------------------------- ------------------- ----------- ----------- --------------- -------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DisableTests     -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
-qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DisableTests     -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
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-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++
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -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++
-qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DisableTests     -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
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DisableTests     -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
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   Android_ANY         armv7       Mingw73     Clang           Packaging DisableTests     -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-r19c -android-arch armeabi-v7a
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   Android_ANY         arm64       Mingw73     Clang           Packaging DisableTests     -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-r19c -android-arch arm64-v8a
-qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   Android_ANY         x86         Mingw73     Clang           Packaging DisableTests     -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-r19c -android-arch x86
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         DisableTests               -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc
-qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc
-qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc
-qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /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
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qtbase.txt

@@ -1,7 +1,4 @@
-Template                          Target OS           Target arch Compiler    Features
+Template                          Target OS           Target arch Compiler    Features       Configure arguments
---------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+--------------------------------- ------------------- ----------- ----------- -------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC         DeveloperBuild DisableTests
+qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015                   -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
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC         DeveloperBuild DisableTests
+qtci-linux-openSUSE-42.3-x86_64   WebAssembly                     GCC         DisableTests   -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten
-qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
-qtci-linux-openSUSE-42.3-x86_64   WebAssembly                     GCC         DeveloperBuild NoPch DisableTests
-

coin/platform_configs/qtconnectivity.txt

@@ -1,3 +1,3 @@
 Template                          Target OS           Target arch Compiler    Features
---------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+--------------------------------- ------------------- ----------- ----------- -------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
+qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015                   -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

coin/platform_configs/qtdeclarative.txt

@@ -1,4 +1,4 @@
-Template                          Target OS           Target arch Compiler    Features
+Template                          Target OS           Target arch Compiler    Features       Configure arguments
---------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+--------------------------------- ------------------- ----------- ----------- -------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC                        -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC         DeveloperBuild
+qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC                        -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -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 -no-xcb

coin/platform_configs/qtsaferenderer.txt

@@ -0,0 +1,5 @@
+Template                            Target OS           Target arch Compiler    Features                                    Configure arguments
+----------------------------------- ------------------- ----------- ----------- ------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10                                           Mingw73                                                 -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++
+qtci-windows-10-x86_64-10                                           Mingw73                                                 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -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++
+qtci-linux-RHEL-7.4-x86_64                                          GCC         DisableTests                                -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker

coin/platform_configs/qtsdk.txt

@@ -1,4 +1,4 @@
-Template                    Target OS           Target arch Compiler    Features
+Template                    Target OS           Target arch Compiler    Features        Configure arguments
---------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+--------------------------- ------------------- ----------- ----------- --------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86-3                                       MSVC2017    Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86-3                                       MSVC2017                    -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-qtci-linux-RHEL-6.6-x86_64                                  GCC         Release ForceDebugInfo
+qtci-linux-RHEL-6.6-x86_64                                  GCC                         -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests

coin/platform_configs/qtwebkit.txt

@@ -1,4 +1,4 @@
-Template                    Target OS           Target arch Compiler    Features
+Template                    Target OS           Target arch Compiler    Features                 Configure arguments
---------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+--------------------------- ------------------- ----------- ----------- ------------------------ --------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                       x86         MSVC2017    DisableTests             -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic
-qtci-windows-7-x86-3                                        Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-7-x86-3                                        Mingw73     Packaging DisableTests   -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic

coin/platform_configs/tqtc-qt-rta.txt

@@ -1,6 +1,5 @@
-Template                    Target OS           Target arch Compiler    Features
+Template                    Target OS           Target arch Compiler    Features      Configure arguments
---------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+--------------------------- ------------------- ----------- ----------- ------------- --------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-7-x86_64-4                                     MSVC2013    Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-7-x86_64-4                                     MSVC2013    DisableTests  -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-qtci-windows-8.1-x86_64                                     MSVC2013    Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                                     MSVC2013    DisableTests  -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-qtci-windows-10-x86-3                                       MSVC2017    Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86-3                                       MSVC2017                  -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-

coin/provisioning/common/linux/android_linux.sh

@@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="r26.1.1"
 toolsFile="sdk-tools-linux-4333796.zip"
-ndkVersion="r18b"
+ndkVersion="r19c"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-28"
 
 toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
-ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
+ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder"
 
 SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
 SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
+SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 

coin/provisioning/common/linux/emsdk.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #############################################################################
 ##
-## Copyright (C) 2018 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.
@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
-version="1.38.1"
+version="1.38.16"
 version_node="8.9.1"
 urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
 urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
@@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten
 urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
 urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
 urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
-sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
+sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
-sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
+sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
 sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
 targetFolder="/opt/emsdk"
 sudo mkdir "$targetFolder"
@@ -76,3 +76,6 @@ EOM
 SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
 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/linux/openssl_for_android_linux.sh

@@ -35,32 +35,38 @@
 
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
-
+set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.0.2p"
+exports_file="/tmp/export.sh"
+# source previously made environmental variables.
+if uname -a |grep -q "Ubuntu"; then
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+else
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+fi
+
+version="1.1.1b"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-installFolder="/home/qt/"
+sha="e9710abf5e95c48ebf47991b10cbb48c09dae102"
-sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
+opensslHome="${HOME}/openssl/android/openssl-${version}"
-# Until every VM doing Linux Android builds have provisioned the env variable
-# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
-# QTQAINFRA-1436
-opensslHome="${installFolder}openssl-1.0.2"
-
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+mkdir -p "${HOME}/openssl/android/"
+tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
 
-tar -xzf "$targetFile" -C "$installFolder"
+TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
-# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
+cd "$opensslHome"
-mv "${opensslHome}p" "${opensslHome}"
+PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
-pushd "$opensslHome"
+PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
-
-echo "Running configure"
-perl Configure shared android
 
 SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
 

coin/provisioning/common/linux/remove-update_notifier.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo apt -q -y remove update-notifier update-manager

coin/provisioning/common/macos/install_openssl.sh

@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# This script install OpenSSL
-
-set -ex
-
-# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-opensslVersion="1.0.2p"
-opensslFile="openssl-$opensslVersion.tar.gz"
-opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
-opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
-
-# Below target location has been hard coded into Coin.
-# QTQAINFRA-1195
-openssl_install_dir=/usr/local/openssl-$opensslVersion
-opensslTargetLocation="/usr/local/opt/openssl"
-
-InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
-cd "/tmp/openssl-$opensslVersion"
-pwd
-sudo ./config --prefix=$openssl_install_dir
-echo "Running 'make' for OpenSSL"
-sudo make --silent > /tmp/openssl_make.log 2>&1
-echo "Running 'make install' for OpenSSL"
-sudo make --silent install > /tmp/openssl_make_install.log 2>&1
-
-path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
-sudo mkdir -p "$path"
-sudo ln -s $openssl_install_dir $opensslTargetLocation
-
-SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
-SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
-
-SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
-SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
-SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
-
-security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
-security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
-
-sudo rm -rf /tmp/openssl-$opensslVersion
-
-echo "OpenSSL = $opensslVersion" >> ~/versions.txt

coin/provisioning/common/macos/libiodbc.sh

@@ -48,7 +48,7 @@ brew install libiodbc
 read -r -a arr <<< $(brew list --versions libiodbc)
 version=${arr[1]}
 
-SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH"
+SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
-SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH"
+SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
 
 echo "libiodbc = $version" >> ~/versions.txt

coin/provisioning/common/macos/macos-version.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2016 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$
+##
+#############################################################################
+
+# This script needs to be called last during provisioning so that the software information will show up last in provision log.
+
+set -ex
+
+# Print all build machines versions to provision log
+echo "*********************************************" >> ~/versions.txt
+echo "***** macOS version *****" >> ~/versions.txt
+sw_vers >> ~/versions.txt
+echo "***** All installed packages *****" >> ~/versions.txt
+echo "***** HomeBrew *****" >> ~/versions.txt
+brew list --versions >> ~/versions.txt
+echo "***** HomeBrew Casks*****" >> ~/versions.txt
+brew cask list --versions >> ~/versions.txt
+echo "***** Apple's installer *****" >> ~/versions.txt
+pkgutil --pkgs >> ~/versions.txt
+echo "*********************************************" >> ~/versions.txt
+
+"$(dirname "$0")/version.sh"

coin/provisioning/common/macos/version.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2016 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$
+##
+#############################################################################
+
+# This script will print all installed software to provision log.
+# Script needs to be named so that it will be ran at last during provisioning
+
+# Print all build machines versions to provision log
+echo "*********************************************"
+echo "***** SW VERSIONS *****"
+cat ~/versions.txt
+echo "*********************************************"

coin/provisioning/common/unix/DownloadURL.sh

@@ -40,6 +40,8 @@
 # If called directly from another script, it will exit the parent script
 # as well, if not called in its own subshell with parentheses.
 
+set -ex
+
 function DownloadURL {
     url=$1
     url_alt=$2
@@ -47,11 +49,11 @@ function DownloadURL {
     targetFile=$4
 
     echo "Downloading from primary URL '$url'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" ||  (
+    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" ||  {
         echo "Failed to download '$url' multiple times"
         echo "Downloading from alternative URL '$url_alt'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
+        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; }
-    )
+    }
 
     echo "Checking SHA1 on PKG '$targetFile'"
     echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"

coin/provisioning/common/unix/install-breakpad.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+set -ex
+
+breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
+breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
+breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
+breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
+
+linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
+linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
+linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
+linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
+
+targetBreakpad="/tmp/$breakpad_tar"
+targetSyscall="/tmp/$linux_syscall_support_tar"
+installFolder="$HOME"
+breakpadHome="$HOME/breakpad"
+
+# shellcheck disable=SC2015
+( DownloadURL "$breakpad_tar_url" "$breakpad_tar_url" "$breakpad_tar_sha" "$targetBreakpad" ) && (
+    DownloadURL "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_sha" "$targetSyscall"
+    ) && (
+    tar -xzf "$targetBreakpad" -C "$installFolder"
+    tar -xzf "$targetSyscall" -C "/tmp"
+    mv "/tmp/linux-syscall-support/" "$breakpadHome/src/third_party/lss/"
+    rm -rf $targetBreakpad
+    rm -rf $targetSyscall
+    ) || (
+    cd "$HOME"
+    git clone https://chromium.googlesource.com/breakpad/breakpad "$breakpadHome"
+    git clone https://chromium.googlesource.com/linux-syscall-support "$breakpadHome/src/third_party/lss"
+    cd "$breakpadHome"
+    git checkout "$breakpad_commit_sha"
+    cd "$breakpadHome/src/third_party/lss"
+    git checkout "$linux_syscall_support_commit_sha1"
+    )
+
+
+SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
+
+echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
+echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt

coin/provisioning/common/unix/install-openssl.sh

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script install OpenSSL from sources.
+# Requires GCC and Perl to be in PATH.
+set -ex
+os="$1"
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+version="1.1.1b"
+officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
+targetFile="/tmp/openssl-$version.tar.gz"
+sha="e9710abf5e95c48ebf47991b10cbb48c09dae102"
+opensslHome="${HOME}/openssl-${version}"
+opensslSource="${opensslHome}-src"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+tar -xzf "$targetFile" -C "$HOME"
+mv "$opensslHome" "$opensslSource"
+cd "$opensslSource"
+pwd
+
+if [[ "$os" == "linux" ]]; then
+    ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
+    make && make install_sw install_ssldirs
+    SetEnvVar "OPENSSL_HOME" "$opensslHome"
+    if uname -a |grep -q "Ubuntu"; then
+        echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile
+    else
+        echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
+    fi
+
+elif [ "$os" == "macos" ]; then
+    # Below target location has been hard coded into Coin.
+    # QTQAINFRA-1195
+    openssl_install_dir=/usr/local/openssl-$version
+    opensslTargetLocation="/usr/local/opt/openssl"
+    sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack"
+    echo "Running 'make' for OpenSSL"
+    # shellcheck disable=SC2024
+    sudo make --silent > /tmp/openssl_make.log 2>&1
+    echo "Running 'make install' for OpenSSL"
+    # shellcheck disable=SC2024
+    sudo make --silent install > /tmp/openssl_make_install.log 2>&1
+
+    path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
+    sudo mkdir -p "$path"
+    sudo ln -s $openssl_install_dir $opensslTargetLocation
+
+    SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
+    SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
+
+    SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
+    SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
+    SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
+
+    security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
+    security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
+fi
+
+
+echo "OpenSSL = $version" >> ~/versions.txt

coin/provisioning/common/unix/install_protobuff.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# shellcheck source=./SetEnvVar.sh
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
+
+# This script will install Google's Protocal Buffers which is needed by Automotive Suite
+
+version="3.6.1"
+sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
+externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
+
+targetDir="$HOME/protobuf-$version"
+targetFile="$targetDir.zip"
+DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
+unzip "$targetFile" -d "$HOME"
+sudo rm "$targetFile"
+
+# devtoolset is needed when running configuration
+if uname -a |grep -qv "Darwin"; then
+    export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
+fi
+
+echo "Configuring and building protobuf"
+cd "$targetDir"
+if uname -a |grep -q Darwin; then
+    ./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
+    SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
+else
+    ./configure
+fi
+make
+sudo make install
+
+# Refresh shared library cache if OS isn't macOS
+if uname -a |grep -qv "Darwin"; then
+    sudo ldconfig
+fi
+
+sudo rm -r "$targetDir"

coin/provisioning/common/unix/squishInstall.sh

@@ -38,9 +38,9 @@ set -ex
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.3.2"
+version="6.4.3"
 # Branch version without dot
-qtBranch="510x"
+qtBranch="512x"
 squishFolder="/opt/squish"
 squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
 squishFile="squish-$version-qt$qtBranch-linux64.run"

coin/provisioning/common/windows/android-openssl.ps1

@@ -35,37 +35,40 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
+if (Is64BitWinHost) {
+    $msys_bash = "C:\Utils\msys64\usr\bin\bash"
+} else {
+    $msys_bash = "C:\Utils\msys32\usr\bin\bash"
+}
+
 # OpenSSL need to be configured from sources for Android build in windows 7
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$version = "1.0.2p"
+$version = "1.1.1b"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
+$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102"
 $destination = "C:\Utils\openssl-android-master"
 
+# msys unix style paths
+$ndkPath = "/c/Utils/Android/android-ndk-r19c"
+$openssl_path = "/c/Utils/openssl-android-master"
+$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
 Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
 Verify-Checksum $zip $sha1
 
-Extract-7Zip $zip C:\Utils
+Extract-7Zip $zip C:\Utils\tmp
-Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
+Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
-Rename-Item C:\Utils\openssl-$version $destination
+Move-Item C:\Utils\tmp\openssl-${version} $destination
 Remove-Item -Path $zip
-Remove-Item C:\Utils\openssl-$version.tar
-
-Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
-Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
-Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
-
-# Make sure configure for openssl has a "make" and "perl" available
-$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
 
 Write-Host "Configuring OpenSSL $version for Android..."
 Push-Location $destination
-Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
+# $ must be escaped in powershell...
+Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
 Pop-Location
 
-# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
+Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
-# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
+Remove-item C:\Utils\tmp -Recurse -Confirm:$false
-
 Write-Output "Android OpenSSL = $version" >> ~/versions.txt

coin/provisioning/common/windows/android.ps1

@@ -40,10 +40,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkVersion = "r18b"
+$ndkVersion = "r19c"
-$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
+$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
-$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
+$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
-$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
+$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 
@@ -85,7 +85,7 @@ if (IsProxyEnabled) {
     # Remove "http://" from the beginning
     $proxy = $proxy.Remove(0,7)
     $proxyhost,$proxyport = $proxy.split(':')
-    $sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
+    $sdkmanager_args = "--no_https", "--proxy=http", "--proxy_host=`"$proxyhost`"", "--proxy_port=`"$proxyport`""
 }
 
 New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
@@ -95,9 +95,10 @@ 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")
 
-$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion"
-Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
 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'
+Invoke-Expression $command
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
 iex $command
 cmd /c "dir C:\Utils\android"

coin/provisioning/common/windows/dxsdk.ps1

@@ -4,16 +4,16 @@
 
 $package = "DXSDK_Jun10.exe"
 
-$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
-$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
+$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
-$exe = "C:\Windows\Temp\$package"
+$package_path = "C:\Windows\Temp\$package"
-
-Download $officialUrl $cachedUrl $exe
 
+Download $officialUrl $cachedUrl $package_path
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
-Run-Executable $exe "/u"
+Run-Executable $package_path "/u"
 
-Remove-Item -Path $exe
+Remove-Item -Path $package_path
 
 Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt

coin/provisioning/common/windows/helpers.ps1

@@ -35,6 +35,28 @@ function Run-Executable
     }
 }
 
+function Extract-tar_gz
+{
+    Param (
+        [string]$Source,
+        [string]$Destination
+    )
+    Write-Host "Extracting '$Source' to '$Destination'..."
+
+    if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
+        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
+        if (-not (test-path $zipExe)) {
+            $zipExe = "C:\Utils\sevenzip\7z.exe"
+            if (-not (test-path $zipExe)) {
+                throw "Could not find 7-zip."
+            }
+        }
+    } else {
+        $zipExe = "7z.exe"
+    }
+    Run-Executable "cmd.exe"  "/C $zipExe x -y `"$Source`" -so | $zipExe x -y -aoa -si -ttar `"-o$Destination`""
+}
+
 function Extract-7Zip
 {
     Param (
@@ -114,6 +136,18 @@ function Add-Path
     $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
 }
 
+function Prepend-Path
+{
+    Param (
+        [string]$Path
+    )
+    Write-Host "Adding $Path to Path"
+
+    $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+    [Environment]::SetEnvironmentVariable("Path", "$Path;" + $oldPath, [EnvironmentVariableTarget]::Machine)
+    $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+}
+
 function Set-EnvironmentVariable
 {
     Param (
@@ -137,3 +171,22 @@ function IsProxyEnabled {
 function Get-Proxy {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }
+
+function Remove {
+
+    Param (
+        [string]$Path = $(BadParam("a path"))
+    )
+    Write-Host "Removing $Path"
+    $i = 0
+    While ( Test-Path($Path) ){
+        Try{
+            remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+        }catch{
+            $i +=1
+            if ($i -eq 5) {exit 1}
+            Write-Verbose "$Path locked, trying again in 5"
+            Start-Sleep -seconds 5
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+# This script install breakpad from sources.
+# for manual install.. remember to checkout correct version
+#   git clone https://chromium.googlesource.com/breakpad/breakpad
+#   git clone https://chromium.googlesource.com/linux-syscall-support breakpad/src/third_party/lss
+
+# Commit used to make this zip breakpad_20181113.tar.gz
+#   breakpad
+#       commit 66571f4838b2306161f072555cb199049bc68142 (HEAD -> master, origin/master, origin/HEAD)
+#   linux-syscall-support
+#       commit 93426bda6535943ff1525d0460aab5cc0870ccaf (HEAD -> master, origin/master, origin/HEAD)
+
+# This script installs breakpad.
+
+
+. "$PSScriptRoot\helpers.ps1"
+
+
+$breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
+$breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
+$breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
+$breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
+
+$linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
+$linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
+$linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
+$linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
+
+$targetBreakpad="$env:tmp\$breakpad_tar"
+$targetSyscall="$env:tmp\$linux_syscall_support_tar"
+$installFolder = "C:\Utils"
+
+# breakpad
+try {
+    Download $breakpad_tar_url $breakpad_tar_url $targetBreakpad
+    Verify-Checksum $targetBreakpad $breakpad_tar_sha
+    Extract-tar_gz $targetBreakpad $installFolder
+    Remove-Item -Path $targetBreakpad
+    # linux-syscall-support
+    Download $linux_syscall_support_tar_url $linux_syscall_support_tar_url $targetSyscall
+    Verify-Checksum $targetSyscall $linux_syscall_support_tar_sha
+    Extract-tar_gz $targetSyscall "$env:tmp\"
+    New-Item -ItemType directory -Path "$installFolder\breakpad\third_party\lss"
+    Get-ChildItem -Path "$env:tmp\linux-syscall-support\*" -Recurse | Move-Item -Destination "$installFolder\breakpad\third_party\lss"
+    Remove-Item -Path $targetSyscall
+}
+catch {
+    Write-Host "Cached download failed: Attempping fallback method eg git."
+    Set-Location $installFolder
+    git.exe clone "https://chromium.googlesource.com/breakpad/breakpad"
+    git.exe clone "https://chromium.googlesource.com/linux-syscall-support breakpad\third_party\ssl"
+    Set-Location  "breakpad"
+    git checkout $breakpad_commit_sha
+    Set-Location  "src/third_party/lss"
+    git checkout $linux_syscall_support_commit_sha1
+}
+
+Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
+
+# Write HEAD commit sha to versions txt, so build can be repeated at later date
+Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
+Write-Output "linux-syscall-support = $linux_syscall_support_tar" >> ~/versions.txt

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

@@ -0,0 +1,46 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install gnuwin32
+
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
+
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

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

@@ -37,7 +37,8 @@ function InstallMinGW
 {
     Param (
         [string] $release = $(BadParam("release file name")),
-        [string] $sha1    = $(BadParam("SHA1 checksum of the file"))
+        [string] $sha1    = $(BadParam("SHA1 checksum of the file")),
+        [string] $suffix  = ""
     )
 
     $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
@@ -45,7 +46,7 @@ function InstallMinGW
     if ($arch -eq "i686") { $win_arch = "Win32" }
     elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
 
-    $envvar = "MINGW$version"
+    $envvar = "MINGW$version$suffix"
     $envvar = $envvar -replace '["."]'
     $targetdir = "C:\$envvar"
     $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"

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

@@ -0,0 +1,70 @@
+############################################################################
+##
+## 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$
+##
+#############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script installs 7-Zip
+
+$version = "20181211"
+$prog = "msys2"
+if (Is64BitWinHost) {
+    $arch = "x86_64"
+    $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
+    $folder = "msys64"
+} else {
+    $arch = "i686"
+    $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
+    $folder = "msys32"
+}
+$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
+
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$url_official = "http://repo.msys2.org/distrib/$arch/$package"
+$PackagePath = "C:\Windows\Temp\$package"
+$TargetLocation = "C:\Utils"
+
+
+Download $url_official $url_cache $PackagePath
+Verify-Checksum $PackagePath $sha1
+Extract-tar_gz $PackagePath $TargetLocation
+$msys = "$TargetLocation\$folder\msys2_shell.cmd"
+
+# install perl
+Run-Executable "$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`""
+
+Write-Host "Cleaning $PackagePath.."
+Remove-Item -Recurse -Force -Path "$PackagePath"
+
+Write-Output "7-Zip = $version" >> ~\versions.txt

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

@@ -0,0 +1,64 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install Google's Protocol Buffers
+# Script requires Cmake to be installed and strawberry-perl not to be installed
+
+$version = "3.6.1"
+$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
+$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
+$zip = "C:\Utils\protobuf-all-$version.zip"
+$installationFolder = "C:\Utils\protobuf"
+
+Write-Host "Installing Protocol Buffers"
+Add-Path "C:\CMake\bin"
+Download "$officialUrl" "$cachedUrl" "$zip"
+Verify-Checksum "$zip" "$sha1"
+Extract-7Zip "$zip" C:\Utils
+New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build"
+New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release"
+New-Item -ItemType directory -Force -Path "$installationFolder"
+cd "C:\Utils\protobuf-$version\cmake\build\release"
+cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install"
+if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
+    Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!"
+    exit 1
+}
+
+Remove-Item "$zip"
+
+Add-Path "$installationFolder\bin"
+Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
+Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib"

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

@@ -1,8 +1,6 @@
-#!/bin/env bash
+############################################################################
-
-#############################################################################
 ##
-## Copyright (C) 2017 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.
@@ -33,41 +31,30 @@
 ##
 #############################################################################
 
-set +e
+. "$PSScriptRoot\helpers.ps1"
 
-# shellcheck disable=SC1090
+# This script installs sed and it's dependencies
 
-# We need to source to be able to use cmake in the shell
+$prog = "sed"
-if uname -a |grep -q "Ubuntu"; then
+$version = "4.2.1"
-    source ~/.profile
+$sha1 = "dfd3d1dae27a24784d7ab40eb074196509fa48fe"
-else
+$dep_sha1 = "f7edbd7152d8720c95d46dd128b87b8ba48a5d6f"
-    source ~/.bashrc
+$pkg = "$prog-$version-bin.zip"
-fi
+$dep_pkg = "$prog-$version-dep.zip"
+$cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$pkg"
+$dep_cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$dep_pkg"
+$install_location = "c:\Utils\$prog"
 
-set -ex
+$tmp_location = "c:\users\qt\downloads"
+Download $cached_url $cached_url "$tmp_location\$pkg"
+Verify-Checksum "$tmp_location\$pkg" $sha1 sha1
+Download $dep_cached_url $dep_cached_url "$tmp_location\$dep_pkg"
+Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1 sha1
 
-# shellcheck source=../unix/SetEnvVar.sh
+Extract-7Zip "$tmp_location\$pkg" $install_location
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+Extract-7Zip "$tmp_location\$dep_pkg" $install_location
-
+Remove "$tmp_location\$pkg"
-TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
+Remove "$tmp_location\$dep_pkg"
-# shellcheck disable=SC2064
-trap "sudo rm -fr $TEMPDIR" EXIT
-cd "$TEMPDIR"
-
-sudo pip install --upgrade pip
-sudo pip install six
-
-git clone https://github.com/open62541/open62541.git open62541
-cd open62541
-git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
-mkdir build
-cd build
-TARGETPATH=/opt/open62541
-cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
-make
-
-sudo make install
-sudo /sbin/ldconfig
-
-SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"
 
+Prepend-Path "$install_location\bin"
+Write-Output "sed = $version" >> ~/versions.txt

coin/provisioning/common/windows/msys.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install msys which is needed for configuring openssl for Android
 

coin/provisioning/common/windows/opcua_unifiedautomation.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 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.
@@ -33,27 +33,58 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = Get-DownloadLocation "uasdkcpp.zip"
+function DownloadAndInstallUA
-$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
+{
-$installLocation = "C:\Utils\uacpp"
+    Param (
+        [string] $InstallerFileName = $(BadParam("no download URL specified")),
+        [string] $sha1 = $(BadParam("No SHA1 for download specified")),
+        [string] $Destination = $(BadParam("No location to install specified"))
+    )
+    Write-Host "UACPPSDK: DownloadAndInstallUA $InstallerFileName"
+    $zip = Get-DownloadLocation "uasdkcpp.zip"
 
-Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
+    Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
-$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/$InstallerFileName.zip"
-# No public download link exists
+    # No public download link exists
-$externalUrl = $internalUrl
+    $externalUrl = $internalUrl
 
-Download $externalUrl $internalUrl $zip
+    Download $externalUrl $internalUrl $zip
-Verify-Checksum $zip $sha1
+    Verify-Checksum $zip $sha1
 
-Write-Host "UACPPSDK: Installing $zip..."
+    Write-Host "UACPPSDK: Extracting $zip..."
-Extract-7Zip $zip (Get-DefaultDownloadLocation)
+    Extract-7Zip $zip (Get-DefaultDownloadLocation)
-Remove-Item -Path $zip
+    Remove-Item -Path $zip
 
-$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe"
+    $executable = (Get-DefaultDownloadLocation) + "$InstallerFileName.exe"
-$arguments = "/S /D=$installLocation"
+    # We cannot call the installer as the x86 and x64 versions of the installer are not
-Run-Executable $executable $arguments
+    # allowed to be installed in parallel (they check for the same registry value and
-Write-Host "UACPPSDK: Installer done."
+    # delete each other). Extracting does not have a side-effect for Qt
-Remove-Item $executable
+    #$arguments = "/S /D=$installLocation"
+    #Run-Executable $executable $arguments
+    #Write-Host "UACPPSDK: Installer done."
+    #Remove-Item $executable
 
-Write-Host "Set environment variable for COIN to locate SDK"
+    Extract-7Zip $executable $Destination
-Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation"
+    Remove-Item $executable
+}
+
+#x86 version
+$installerName86 = "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406"
+$downloadSha86 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C"
+$installLocation86 = "C:\Utils\uacpp_x86"
+
+DownloadAndInstallUA $installerName86 $downloadSha86 $installLocation86
+Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation86"
+# For UA msvc2015 is binary compatible with msvc2017
+Set-EnvironmentVariable "CI_UACPP_msvc2017_x86_PREFIX" "$installLocation86"
+
+
+#x64 version
+$installerName64 = "uasdkcppbundle-bin-EVAL-win64-x86_64-vs2015-v1.6.3-406"
+$downloadSha64 = "1384e6882644f9163e9840aee962cdb9ca3398c8"
+$installLocation64 = "C:\Utils\uacpp_x64"
+
+DownloadAndInstallUA $installerName64 $downloadSha64 $installLocation64
+Set-EnvironmentVariable "CI_UACPP_msvc2015_x64_PREFIX" "$installLocation64"
+# For UA msvc2015 is binary compatible with msvc2017
+Set-EnvironmentVariable "CI_UACPP_msvc2017_x64_PREFIX" "$installLocation64"

coin/provisioning/common/windows/open62541.ps1

@@ -1,265 +0,0 @@
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-Param (
-    [string]$targetCommand= ""
-    )
-
-. "$PSScriptRoot\helpers.ps1"
-
-## Variables for builds
-$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f"
-$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d"
-$extractTarget = "C:\open62541_build"
-
-function CreateArchive
-{
-    param(
-        [string]$sourceDirectory=$(throw("You must specify a directory")),
-        [string]$archiveName=$(throw("You must specify an archive name"))
-    )
-
-    if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
-        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
-        if (-not (test-path $zipExe)) {
-            $zipExe = "C:\Utils\sevenzip\7z.exe"
-            if (-not (test-path $zipExe)) {
-                throw "Could not find 7-zip."
-            }
-        }
-    } else {
-        $zipExe = "7z.exe"
-    }
-
-    Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`""
-}
-
-function PrepareRepository
-{
-    $username = $env:USERNAME
-    $zip = "c:\users\$username\downloads\open62541.zip"
-
-    $externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
-    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip"
-
-    Download $externalUrl $internalUrl $zip
-    Verify-Checksum $zip $sha1
-
-    Extract-7Zip $zip $extractTarget
-}
-
-function PushDevEnvironment
-{
-    # Provisioning updates the registry entries for PATH etc. However, they are not
-    # propagated to the next provisioning script and hence need to be manually
-    # read / set.
-    $adaptedPath = $env:PATH
-    $jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine")
-    $adaptedPath = $adaptedPath + ";" + $jomLocation
-    $adaptedPath = $adaptedPath + ";" + "C:\Python27"
-    $adaptedPath = $adaptedPath + ";" + "C:\CMake\bin"
-    [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
-}
-
-function MSVCEnvironment
-{
-    Param (
-        [string]$msvcDir=$(throw("No VS Directory specified")),
-        [string]$msvcbat=$(throw("No vsvars batch file specified"))
-    )
-
-    Push-Location $msvcDir
-    cmd /c "$msvcbat&set" |
-    foreach {
-        if ($_ -match "=") {
-            $v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])"
-        }
-    }
-    Pop-Location
-}
-
-function BuildAndInstallOpen62541
-{
-    Param (
-        [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
-        [string]$Platform=$(throw("You must specify the target platform [x86, x64]")),
-        [string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]"))
-    )
-    Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand"
-
-    ## Make Build directory
-    $buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform
-    if (Test-Path $buildDir) {
-        Write-Host " Deleting pre-existing build directory"
-        Remove-Item $buildDir -Force -Recurse
-    }
-    New-Item -ItemType Directory -Force -Path $buildDir
-    Push-Location $buildDir
-
-    ## Invoke Cmake
-    $makeGenerator = "NMake Makefiles JOM"
-    $installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform
-    if (Test-Path $installTarget) {
-        Write-Host " Deleting pre-existing install directory"
-        Remove-Item $installTarget -Force -Recurse
-    }
-
-    if ($Type.StartsWith("mingw")) {
-        $makeGenerator = "MinGW Makefiles"
-    }
-    cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib ..
-
-    ## Call build command
-    Write-Host "### Open62541: Compilation ###"
-    Run-Executable $MakeCommand
-
-    ## call install command
-    Write-Host "### Open62541: Installation ###"
-    Run-Executable $MakeCommand install
-
-    $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX"
-    Set-EnvironmentVariable $platformVariable $installTarget
-
-    ## Packaging
-    Push-Location "C:\Utils"
-    $archiveName = "open62541_" + $Type + "_" + $Platform + ".7z"
-    CreateArchive $installTarget $archiveName
-    Pop-Location
-
-    ## cleanup build directory
-    Write-Host "### Open62541: Cleanup ###"
-    Pop-Location
-    Remove-Item $buildDir -Force -Recurse
-}
-
-function DownloadAndInstall
-{
-    Param (
-        [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
-        [string]$Platform=$(throw("You must specify the target platform [x86, x64]"))
-    )
-    $baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/"
-    $targetName = "open62541_" + $Type + "_" + $Platform
-    $archiveName =  $targetName + ".7z"
-    $downloadUrl = $baseLocation + $archiveName
-
-    # Download
-    $downloadTarget = "C:\Utils\" + $archiveName
-    Download $downloadUrl $downloadUrl $downloadTarget
-
-    # Extract
-    Push-Location C:\Utils
-    Extract-7Zip $downloadTarget C:\Utils
-    Pop-Location
-
-    # Set environment variable
-    $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform
-    $platformPath = "C:\Utils\" + $targetName
-    Set-EnvironmentVariable $platformVariable $platformPath
-}
-
-##############################
-# Startup                    #
-##############################
-if ($targetCommand.StartsWith("mingw")) {
-    Write-Host "### Creating Open62541 for MinGW"
-    $mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine")
-    if (!$mingwPath) {
-        throw("Could not find mingw")
-    }
-
-    # Strawberry has its own gcc, put mingw in front
-    $adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine")
-    [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
-
-    PushDevEnvironment
-    BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
-} elseif ($targetCommand -eq "msvc2015_x86") {
-    Write-Host "### Creating Open62541 for MSVC2015 x86"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2015 x86 jom
-} elseif ($targetCommand -eq "msvc2015_x64") {
-    Write-Host "### Creating Open62541 for MSVC2015 x64"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2015 x64 jom
-} elseif ($targetCommand -eq "msvc2017_x86") {
-    Write-Host "### Creating Open62541 for MSVC2017 x86"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2017 x86 jom
-} elseif ($targetCommand -eq "msvc2017_x64") {
-    Write-Host "### Creating Open62541 for MSVC2017 x64"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2017 x64 jom
-} elseif ($targetCommand -eq "prepare") {
-    PrepareRepository
-} elseif ($targetCommand -eq "build") {
-    Write-Host "### Building for all supported platforms"
-    PrepareRepository
-    Write-Host "### Invoking MinGW530 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530
-    Write-Host "### Invoking MinGW630 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630
-    Write-Host "### Invoking MinGW730 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730
-    Write-Host "### Invoking MSVC2015 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64
-    Write-Host "### Invoking MSVC2017 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64
-    Write-Host "### Archives have been generated at C:/Utils. Please upload manually"
-} elseif ($targetCommand -eq "packaged") {
-    Write-Host "### Expecting pre-built packages, download and install from archives"
-    Write-Host "### MinGW530 x64"
-    DownloadAndInstall mingw530 x86
-    Write-Host "### MinGW630 x64"
-    DownloadAndInstall mingw630 x86
-    Write-Host "### MinGW730 x64"
-    DownloadAndInstall mingw730 x64
-    Write-Host "### MSVC2015 x86"
-    DownloadAndInstall msvc2015 x86
-    Write-Host "### MSVC2015 x64"
-    DownloadAndInstall msvc2015 x64
-    Write-Host "### MSVC2017 x64"
-    DownloadAndInstall msvc2017 x64
-} elseif ($targetCommand) {
-    Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)"
-    throw("Unknown parameter")
-} else {
-    # Default behavior
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build
-}

coin/provisioning/common/windows/openssl.ps1

@@ -36,7 +36,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-$version = "1_0_2p"
+$version = "1_1_1b"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
     $installFolder = "C:\openssl"
     $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6"
+    $sha1 = "5b50819dd84aa9219e0cad9cdddf78285bdd1bbb"
 
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236"
+$sha1 = "1ae5ad4fe5dae01dd056274979cce26945c9e86c"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/squishInstall.ps1

@@ -38,18 +38,18 @@
 # NOTE! Make sure 64bit versions are always installed before 32bit,
 # because they use same folder name before a rename
 
-$version = "6.3.2"
+$version = "6.4.3"
 
 # Qt branch without dot (*.*)
-$qtBranch = "510x"
+$qtBranch = "512x"
-# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
+# 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.
 
 $targetDir = "C:\Utils\squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
 $squishBranchUrl = "$squishUrl\$qtBranch"
 $testSuite = "suite_test_squish"
-$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
+$testSuiteUrl = "$squishUrl\$testSuite.7z"
 
 # Squish license
 $licensePackage = ".squish-3-license"
@@ -62,7 +62,10 @@ Function DownloadAndInstallSquish {
         [string]$bit,
         [string]$squishPackage
     )
-
+    # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
+    if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
+        $qtBranch = "511x"
+    }
     $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
     $SquishInstaller = "$targetDir\$squishPackage.exe"
     $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
@@ -125,25 +128,27 @@ DownloadSquishLicence $squishUrl
 if ($OSVersion -eq "Windows 10 Enterprise") {
 
     if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 msvc14
+        DownloadAndInstallSquish $version win64 "msvc14"
+        DownloadAndInstallSquish $version win64 "msvc141"
+        DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
+    } else {
+        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
     }
-    DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+    DownloadAndInstallSquish $version win32 "msvc141"
-    DownloadAndInstallSquish $version win32 "msvc14"
 
 } elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
 
     if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc12"
         DownloadAndInstallSquish $version win64 "msvc14"
     }
-    DownloadAndInstallSquish $version win32 "msvc14"
+    DownloadAndInstallSquish $version win32 "msvc141"
 
 } elseif ($OSVersion -eq "Windows 7 Enterprise") {
 
     if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc12"
         DownloadAndInstallSquish $version win64 "msvc14"
+    } else {
+        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
     }
-    DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+    DownloadAndInstallSquish $version win32 "msvc141"
-    DownloadAndInstallSquish $version win32 "msvc14"
 }

coin/provisioning/common/windows/vc_redist.ps1

@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 Write-Host "Installing $package..."
 Run-Executable $package "/q"
-Write-Host "Remove $package..."
+Remove $package
-Remove-Item -Force -Path $package

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh

@@ -70,6 +70,7 @@ installPackages+=(speech-dispatcher-devel)
 installPackages+=(python-devel python-pip)
 # Python 3 with python-devel, pip and virtualenv
 installPackages+=(rh-python36)
+installPackages+=(python36-devel)
 # WebEngine
 installPackages+=(bison)
 installPackages+=(flex)
@@ -109,6 +110,11 @@ installPackages+=(xcb-util-image-devel)
 installPackages+=(xcb-util-keysyms-devel)
 installPackages+=(xcb-util-wm-devel)
 installPackages+=(xcb-util-renderutil-devel)
+# ODBC support
+installPackages+=(unixODBC-devel)
+installPackages+=(unixODBC)
+# Vulkan support
+installPackages+=(vulkan-devel)
 
 sudo yum -y install "${installPackages[@]}"
 
@@ -121,7 +127,8 @@ sudo pip install virtualenv wheel
 
 sudo /usr/local/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
-/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-install-openssl.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-breakpad.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh

@@ -1,8 +1,8 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -33,5 +33,8 @@
 ##
 #############################################################################
 
-# shellcheck source=../common/linux/open62541.sh
+set -ex
-source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
+
+# shellcheck source=../common/unix/install_protobuff.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
+

coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/openssl_for_android_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

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

@@ -37,6 +37,7 @@
 
 set -ex
 
+# shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 NTS_IP=10.212.2.216

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

@@ -45,7 +45,7 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
 done
 
 # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock)
-for i in `seq 10`; do
+for i in $(seq 10); do
     echo attempting to remove aptdaemon
     sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true
     # check that aptdaemon is no longer installed
@@ -178,7 +178,8 @@ echo "Installing packages"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
 # Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+# shellcheck source=../common/linux/disable-ntp_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh

@@ -37,7 +37,7 @@
 
 set -ex
 
+curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add -
 sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main'
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 37BBEE3F7AD95B3F
 sudo apt update
 sudo apt install git-lfs

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh

@@ -33,4 +33,7 @@
 ##
 #############################################################################
 
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/fbx_linux.sh
+"$BASEDIR/../common/linux/fbx_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-breakpad.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/android_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/cmake_linux.sh
+"$BASEDIR/../common/linux/cmake_linux.sh"
 

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -33,5 +33,7 @@
 ##
 #############################################################################
 
-# shellcheck source=../common/linux/open62541.sh
+set -ex
-source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
+
+# shellcheck source=../common/linux/openssl_for_android_linux.sh
+source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_660.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_700.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
+"$BASEDIR/../common/linux/docker.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"
 

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

@@ -168,7 +168,7 @@ waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
 # Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

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

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/remove-update_notifier.sh
+source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh"

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

@@ -34,6 +34,7 @@
 
 set -ex
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 # build latest qemu to usermode

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh

@@ -37,7 +37,9 @@
 
 set -ex
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt..."
@@ -76,7 +78,7 @@ chmod +x "$yoctoInstaller"
 /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64"
 rm -rf "$yoctoInstaller"
 
-if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then
+if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then
     SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7"
     SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7"
     SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64"
@@ -88,3 +90,9 @@ fi
 
 echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt
 echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt
+
+# List qt user in qemu toolchain sysroots
+sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/passwd"
+sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/group"
+sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/passwd"
+sudo sh -c "grep ^qt /etc/group >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/group"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh

@@ -35,6 +35,7 @@
 
 set -ex
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh

@@ -33,4 +33,7 @@
 ##
 #############################################################################
 
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-breakpad.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -33,4 +33,7 @@
 ##
 #############################################################################
 
-source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
+set -ex
+
+# shellcheck source=../common/linux/openssl_for_android_linux.sh
+source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_660.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_700.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
+"$BASEDIR/../common/linux/docker.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
+# shellcheck source=../common/linux/squish-coco.sh
 source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/ubuntu-version.sh
+"$BASEDIR/../common/linux/ubuntu-version.sh"

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

@@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv
 sudo pkcon -y install libpython3_4m1_0 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
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/emsdk.sh
 source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"

coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh

@@ -1 +0,0 @@
-../common/macos/sha1sum-compatibility.sh

coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/macos/sha1sum-compatibility.sh
+source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh"

coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh

@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
+set -ex
 
-$(dirname $0)/../common/unix/disable-ntp_macos.sh
+# shellcheck source=../common/unix/disable-ntp_macos.sh
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"

coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh

@@ -1,2 +1,5 @@
 #!/usr/bin/env bash
-$(dirname "$0")/../common/macos/disable_spotlight.sh
+set -ex
+
+# shellcheck source=../common/macos/disable_spotlight.sh
+source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"

coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh

@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=../common/macos/InstallPKGFromURL
+# shellcheck source=../common/macos/InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"

coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh

@@ -35,6 +35,7 @@
 
 set -ex
 
+# shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
 
 version="9.2"

coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/cmake.sh
+"$BASEDIR/../common/macos/cmake.sh"

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

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/homebrew.sh
+"$BASEDIR/../common/macos/homebrew.sh"

coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 
+# shellcheck source=../common/macos/python2.sh
 source "${BASH_SOURCE%/*}/../common/macos/python2.sh"

coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 
+# shellcheck source=../common/macos/python3.sh
 source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh

@@ -4,4 +4,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/libiodbc.sh
+"$BASEDIR/../common/macos/libiodbc.sh"

coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/virtualenv.sh
+"$BASEDIR/../common/macos/virtualenv.sh"

coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh

@@ -4,4 +4,4 @@ set -ex
 
 BASEDIR=$(dirname "$0")
 # There is only one mac package
-$BASEDIR/../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh"

coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh

@@ -3,5 +3,5 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/fbx_macos.sh
+"$BASEDIR/../common/macos/fbx_macos.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh

@@ -2,4 +2,5 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
+# shellcheck source=../common/macos/install_openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos"

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

@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
 # Login keychain
 sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
+loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt")
 loginKeychain=$keychains/login.keychain
 
 echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
 
 sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
 Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
+DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
 
 echo "Unlocking $devIDKeychain with password.."
 security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
 
 sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
-iosPassword=$(<"$targetFolder/ios_password.txt")
+iosPassword=$(cat "$targetFolder/ios_password.txt")
 
 iPhoneDeveloper="iosdevelopment.p12"
 shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
-security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
 
 iPhoneDistribution="iosdistribution.p12"
 shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
-security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
 
 # Mobileprovision
 echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."

coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh

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