summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/platform_configs/default.yaml35
-rw-r--r--coin/platform_configs/flashing-wizard.yaml23
-rw-r--r--coin/platform_configs/qdb.yaml23
-rw-r--r--coin/platform_configs/qt5.yaml88
-rw-r--r--coin/platform_configs/qtsdk.yaml5
-rw-r--r--coin/platform_configs/tqtc-qt-config-gui.yaml28
-rwxr-xr-xcoin/provisioning/common/linux/cmake_linux.sh10
-rwxr-xr-xcoin/provisioning/common/linux/openssl_for_android_linux.sh4
-rwxr-xr-xcoin/provisioning/common/linux/remove-update_notifier.sh2
-rwxr-xr-xcoin/provisioning/common/macos/install-commandlinetools.sh2
-rwxr-xr-xcoin/provisioning/common/macos/install_openssl_111a.sh78
-rwxr-xr-xcoin/provisioning/common/unix/DownloadURL.sh4
-rw-r--r--coin/provisioning/common/unix/common.sourced.sh26
-rwxr-xr-xcoin/provisioning/common/unix/install-openssl.sh4
-rw-r--r--coin/provisioning/common/windows/android-openssl.ps127
-rw-r--r--coin/provisioning/common/windows/cmake.ps16
-rw-r--r--coin/provisioning/common/windows/disable-clean-manager.ps18
-rw-r--r--coin/provisioning/common/windows/install-gnuwin32.ps11
-rw-r--r--coin/provisioning/common/windows/openssl.ps16
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps16
-rw-r--r--coin/provisioning/common/windows/telegraf_password.ps113
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh43
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh46
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh48
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh46
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh10
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh51
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh37
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh74
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh48
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh9
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh3
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh3
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh3
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh41
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh91
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh9
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh52
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-java.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh50
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh47
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh58
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh57
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh138
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh13
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh13
-rwxr-xr-xcoin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh5
-rw-r--r--coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps11
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtlottie0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtnetworkauth0
m---------qtpurchasing0
m---------qtqa0
m---------qtquick3d0
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtquicktimeline0
m---------qtremoteobjects0
m---------qtrepotools0
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebglplugin0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
124 files changed, 219 insertions, 1331 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 7df0f4b0..1748ac23 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -11,17 +11,9 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
- Template: 'qtci-windows-10-x86_64-14'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'Mingw73'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch x86'
--
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
- Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
@@ -47,7 +39,7 @@ Configurations:
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
Features: ['Packaging']
- Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
-
Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang'
@@ -59,6 +51,11 @@ Configurations:
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
-
+ Template: 'qtci-macos-10.14-x86_64'
+ Compiler: 'Clang'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
+-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'IOS_ANY'
Target arch: 'multi'
@@ -80,14 +77,6 @@ Configurations:
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
-
- Template: 'qtci-macos-10.13-x86_64-2'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host darwin-x86_64 -android-arch x86'
--
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'Android_ANY'
Target arch: 'multi'
@@ -96,14 +85,6 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-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-r20 -android-ndk-host linux-x86_64'
-
- Template: 'qtci-linux-RHEL-7.6-x86_64'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host linux-x86_64 -android-arch x86'
--
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'armv7'
@@ -134,4 +115,4 @@ Configurations:
Target arch: 'armv7'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix /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'
diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml
new file mode 100644
index 00000000..f0f0e51d
--- /dev/null
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -0,0 +1,23 @@
+Version: 2
+Module only: True
+Configurations:
+ -
+ Template: 'qtci-windows-10-x86_64-14'
+ Compiler: 'MSVC2017'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
+ -
+ Template: 'qtci-windows-10-x86_64-14'
+ Compiler: 'MSVC2017'
+ Target arch: 'x86'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
+ -
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Compiler: 'GCC'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
+ -
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'GCC'
+ Features: ['TestOnly', 'LicenseCheck']
diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml
new file mode 100644
index 00000000..02198976
--- /dev/null
+++ b/coin/platform_configs/qdb.yaml
@@ -0,0 +1,23 @@
+Version: 2
+Module only: True
+Configurations:
+ -
+ Template: 'qtci-windows-10-x86_64-14'
+ Compiler: 'MSVC2015'
+ Target arch: 'x86'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
+ -
+ Template: 'qtci-windows-10-x86_64-14'
+ Compiler: 'MSVC2015'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
+ -
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Compiler: 'GCC'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
+ -
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'GCC'
+ Features: ['TestOnly', 'LicenseCheck']
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 84fff9e9..02f3b719 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -15,12 +15,12 @@
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-14'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_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++'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'WinRT_10'
@@ -35,30 +35,6 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017'
-
- Template: 'qtci-linux-RHEL-7.6-x86_64'
- Target os: 'Android_ANY'
- Target arch: 'armv7'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang'
--
- Template: 'qtci-linux-RHEL-7.6-x86_64'
- Target os: 'Android_ANY'
- Target arch: 'x86_64'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host linux-x86_64 -android-arch x86_64'
--
- Template: 'qtci-linux-RHEL-7.6-x86_64'
- Target os: 'Android_ANY'
- Target arch: 'arm64'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
--
Template: 'qtci-windows-10-x86_64-14'
Target os: 'Android_ANY'
Target arch: 'multi'
@@ -67,38 +43,6 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
-
- Template: 'qtci-windows-10-x86_64-14'
- Target os: 'Android_ANY'
- Target arch: 'armv7'
- Compiler: 'Mingw73'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch armeabi-v7a'
--
- Template: 'qtci-windows-10-x86_64-14'
- Target os: 'Android_ANY'
- Target arch: 'arm64'
- Compiler: 'Mingw73'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch arm64-v8a'
--
- Template: 'qtci-windows-10-x86_64-14'
- Target os: 'Android_ANY'
- Target arch: 'x86_64'
- Compiler: 'Mingw73'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -android-arch x86_64'
--
- Template: 'qtci-macos-10.13-x86_64-2'
- Target os: 'Android_ANY'
- Target arch: 'armv7'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
--
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'Android_ANY'
Target arch: 'multi'
@@ -108,62 +52,46 @@
Configure arguments: '-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-r20 -android-ndk-host darwin-x86_64'
-
Template: 'qtci-macos-10.13-x86_64-2'
- Target os: 'Android_ANY'
- Target arch: 'arm64'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host darwin-x86_64 -android-arch arm64-v8a'
--
- Template: 'qtci-macos-10.13-x86_64-2'
- Target os: 'Android_ANY'
- Target arch: 'x86_64'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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-r20 -android-ndk-host darwin-x86_64 -android-arch x86_64'
--
- Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'QNX_700'
Target arch: 'x86'
Compiler: 'GCC'
Features: ['DisableTests']
- Configure arguments: '-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'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-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'
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'WebAssembly'
diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml
index 2c001058..754e8492 100644
--- a/coin/platform_configs/qtsdk.yaml
+++ b/coin/platform_configs/qtsdk.yaml
@@ -6,3 +6,8 @@
Template: 'qtci-linux-RHEL-6.6-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests'
+-
+ Template: 'qtci-windows-8.1-x86'
+ Compiler: 'MSVC2015'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml
new file mode 100644
index 00000000..da37d0e5
--- /dev/null
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -0,0 +1,28 @@
+Version: 2
+Module only: True
+Configurations:
+ -
+ Template: 'qtci-windows-10-x86_64-14'
+ Compiler: 'MSVC2017'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
+ -
+ Template: 'qtci-windows-10-x86_64-14'
+ Compiler: 'MSVC2017'
+ Target arch: 'x86'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
+ -
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Compiler: 'GCC'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
+ -
+ Template: 'qtci-macos-10.13-x86_64-2'
+ Compiler: 'Clang'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
+ -
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'GCC'
+ Features: ['TestOnly', 'LicenseCheck']
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh
index 2b8d71d0..a3b2a9cc 100755
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -33,7 +33,7 @@
##
#############################################################################
-# This script installs CMake 3.6.2
+# This script installs CMake 3.7.2
# CMake is needed for autotests that verify that Qt can be built with CMake
@@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
+version="3.7.2"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
+SHA1="915bc981aab354821fb9fd28374a720fdb3aa180"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-Linux-x86_64"
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh
index d833975f..4860c01f 100755
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -53,11 +53,11 @@ else
rm -rf "$exports_file"
fi
-version="1.1.1b"
+version="1.1.1d"
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"
+sha="056057782325134b76d1931c48f2c7e6595d7ef4"
opensslHome="${HOME}/openssl/android/openssl-${version}"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
mkdir -p "${HOME}/openssl/android/"
diff --git a/coin/provisioning/common/linux/remove-update_notifier.sh b/coin/provisioning/common/linux/remove-update_notifier.sh
index 152d7fa8..4ee32d61 100755
--- a/coin/provisioning/common/linux/remove-update_notifier.sh
+++ b/coin/provisioning/common/linux/remove-update_notifier.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-sudo apt -q -y remove update-notifier update-manager
+sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core
diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh
index b9f81534..cd7838b6 100755
--- a/coin/provisioning/common/macos/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -50,7 +50,7 @@ function InstallCommandLineTools {
hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
- sudo installer -pkg ./*.pkg -target /
+ sudo installer -pkg ./*.pkg -target / -allowUntrusted
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3
diff --git a/coin/provisioning/common/macos/install_openssl_111a.sh b/coin/provisioning/common/macos/install_openssl_111a.sh
deleted file mode 100755
index cd6cd9e8..00000000
--- a/coin/provisioning/common/macos/install_openssl_111a.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/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
-
-set -ex
-
-# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-opensslVersion="1.1.1a"
-opensslFile="openssl-$opensslVersion.tar.gz"
-opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
-opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="8fae27b4f34445a5500c9dc50ae66b4d6472ce29"
-
-# 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"
-sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack"
-
-sudo make install_sw install_ssldirs
-
-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
-
-sudo rm -rf /tmp/openssl-$opensslVersion
-
-echo "OpenSSL = $opensslVersion" >> ~/versions.txt
diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh
index 0579451f..ac1fd971 100755
--- a/coin/provisioning/common/unix/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
@@ -99,9 +99,9 @@ DownloadURL () {
if ! Download "$url" "$targetFile"
then
echo "FAIL! to download, trying alternative URL: $url2" 1>&2
- if ! Download "$url" "$targetFile"
+ if ! Download "$url2" "$targetFile"
then
- echo 'FAIL! to download even from alternative url' 1>&2
+ echo 'FAIL! to download even from alternative URL' 1>&2
return 1
fi
fi
diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh
index a52880b2..aca5dd04 100644
--- a/coin/provisioning/common/unix/common.sourced.sh
+++ b/coin/provisioning/common/unix/common.sourced.sh
@@ -65,8 +65,10 @@ fatal () {
fi
}
+# Takes one argument which should be the filename of this script. Returns true
+# if the script is being sourced, false if the script is being executed.
is_script_executed () {
- [ x"$(basename "$0")" = x"$1" ]
+ [ x"$(basename $(echo "$0" | sed s/^-//))" = x"$1" ]
}
@@ -74,6 +76,25 @@ is_script_executed common.sourced.sh \
&& fatal "Script common.sourced.sh should always be sourced, not executed"
+_detect_linux_OS_ID () {
+ if [ -f /etc/os-release ]
+ then
+ . /etc/os-release
+ PROVISIONING_OS_ID="$ID"
+ elif [ -f /etc/redhat-release ]
+ then
+ case "$(cat /etc/redhat-release)" in
+ "Red Hat Enterprise Linux"*)
+ PROVISIONING_OS_ID="rhel"
+ ;;
+ "CentOS Linux"*)
+ PROVISIONING_OS_ID="centos"
+ ;;
+ *) fatal "Unknown string in /etc/redhat-release" ;;
+ esac
+ fi
+}
+
set_common_environment () {
# Unfortunately we can't find the provisioning directory from a sourced
# script in a portable way
@@ -86,8 +107,7 @@ set_common_environment () {
case "$uname_s" in
Linux)
PROVISIONING_OS=linux
- . /etc/os-release
- PROVISIONING_OS_ID="$ID"
+ _detect_linux_OS_ID
case "$PROVISIONING_OS_ID" in
suse|sles|opensuse*)
CMD_PKG_INSTALL="sudo zypper -nq install"
diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh
index 01a20935..08a3390b 100755
--- a/coin/provisioning/common/unix/install-openssl.sh
+++ b/coin/provisioning/common/unix/install-openssl.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-version="1.1.1b"
+version="1.1.1d"
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"
+sha="056057782325134b76d1931c48f2c7e6595d7ef4"
opensslHome="${HOME}/openssl-${version}"
opensslSource="${opensslHome}-src"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1
index fb5c5aab..d1877b64 100644
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.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.
@@ -45,9 +45,9 @@ if (Is64BitWinHost) {
# 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.1.1b"
+$version = "1.1.1d"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102"
+$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4"
$destination = "C:\Utils\openssl-android-master"
# msys unix style paths
@@ -65,8 +65,25 @@ Remove-Item -Path $zip
Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination
# $ 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`"")
+
+function CheckExitCode {
+
+ param (
+ $p
+ )
+
+ if ($p.ExitCode) {
+ Write-host "Process failed with exit code: $($p.ExitCode)"
+ exit 1
+ }
+}
+
+$configure = Start-Process -NoNewWindow -Wait -PassThru -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`"")
+CheckExitCode $configure
+
+$make = Start-Process -NoNewWindow -Wait -PassThru -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`"")
+CheckExitCode $make
+
Pop-Location
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1
index ec84d706..9d3d6aef 100644
--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -33,8 +33,8 @@
. "$PSScriptRoot\helpers.ps1"
-$majorminorversion = "3.6"
-$version = "3.6.2"
+$majorminorversion = "3.7"
+$version = "3.7.2"
$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
@@ -44,7 +44,7 @@ Write-Host "Removing old cmake"
Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
+Verify-Checksum $zip "c80c17e858ecfebfaf16fe8af18b174d2600c4e6"
Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
diff --git a/coin/provisioning/common/windows/disable-clean-manager.ps1 b/coin/provisioning/common/windows/disable-clean-manager.ps1
new file mode 100644
index 00000000..6d54e137
--- /dev/null
+++ b/coin/provisioning/common/windows/disable-clean-manager.ps1
@@ -0,0 +1,8 @@
+# This script will disable automatic disk cleanup
+
+. "$PSScriptRoot\helpers.ps1"
+
+Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F"
+
+# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space.
+DisableSchedulerTask "DiskCleanup\SilentCleanup"
diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1
index 99862b3c..6acede79 100644
--- a/coin/provisioning/common/windows/install-gnuwin32.ps1
+++ b/coin/provisioning/common/windows/install-gnuwin32.ps1
@@ -44,3 +44,4 @@ Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
Extract-7Zip "$temp\$zipPackage" C:\Utils
Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt
+Prepend-Path "C:\Utils\gnuwin32\bin"
diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1
index 2f21db37..891f5db7 100644
--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/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_1_1b"
+$version = "1_1_1d"
$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 = "5b50819dd84aa9219e0cad9cdddf78285bdd1bbb"
+ $sha1 = "df9c40e9e82edf693c15302cbc8e8a057857a13c"
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 = "1ae5ad4fe5dae01dd056274979cce26945c9e86c"
+$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index de04d242..2cc45785 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.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.
@@ -73,7 +73,9 @@ Function DownloadAndInstallSquish {
Write-Host "Fetching from URL $squishUrl"
Copy-Item "$SquishUrl" "$SquishInstaller"
Write-Host "Installing Squish"
- Run-Executable "$SquishInstaller" "$SquishParameters"
+ $stdoutFile = [System.IO.Path]::GetTempFileName()
+ $stderrFile = [System.IO.Path]::GetTempFileName()
+ Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null
Remove-Item -Path $SquishInstaller
if ("$bit" -eq "win64") {
if ($squishPackage.StartsWith("mingw")) {
diff --git a/coin/provisioning/common/windows/telegraf_password.ps1 b/coin/provisioning/common/windows/telegraf_password.ps1
index 11d04dbc..773ec866 100644
--- a/coin/provisioning/common/windows/telegraf_password.ps1
+++ b/coin/provisioning/common/windows/telegraf_password.ps1
@@ -31,9 +31,16 @@
##
#############################################################################
+$auth_file = "C:\Users\qt\work\influxdb\coin_vms_writer.auth"
+
+# Provisioning should run even without the secrets repository
+if (Test-Path $auth_file) {
+ $auth_content = Get-Content $auth_file
+ $influxdb_password = $auth_content.Substring($auth_content.LastIndexOf(':') + 1)
+ Remove-Item $auth_file
+} else {
+ $influxdb_password = "no_password_provided"
+}
-$colon_file = Get-Content "C:\Users\qt\work\influxdb\coin_vms_writer.auth"
-$influxdb_password = $colon_file.Substring($colon_file.LastIndexOf(':') + 1)
$telegraf_conf = "C:\telegraf-coin.conf"
(Get-Content $telegraf_conf) | ForEach-Object { $_.Replace("COIN_VMS_WRITER_PASS", $influxdb_password) } | Out-File -Encoding UTF8 $telegraf_conf
-Remove-Item "C:\Users\qt\work\influxdb\coin_vms_writer.auth"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh
deleted file mode 100755
index f12cff1e..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-BASEDIR=$(dirname "$0")
-# shellcheck source=../common/linux/disable-mlocate.sh
-"$BASEDIR/../common/linux/disable-mlocate.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh
deleted file mode 100755
index 84238ebf..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh
+++ /dev/null
@@ -1,43 +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$
-##
-#############################################################################
-
-set -ex
-
-# refresh local certificates
-sudo subscription-manager refresh
-
-# Attach available subscriptions to system. This is needed when subscriptions are renewed.
-sudo subscription-manager attach --auto
-
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
deleted file mode 100755
index 0b85f10d..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/unix/check_and_set_proxy.sh
-source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
-
-# shellcheck disable=SC2031
-if [ "$http_proxy" != "" ]; then
- echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
-fi
-
-sudo yum update -y nss curl
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh
deleted file mode 100755
index 89806892..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=../common/linux/disable-ntp_linux.sh
-source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh
deleted file mode 100755
index 91097dbf..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh
+++ /dev/null
@@ -1,48 +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$
-##
-#############################################################################
-
-# shellcheck source=../common/unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-package="epel-release-6-8.noarch.rpm"
-primaryUrl="https://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/e/$package"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel6/$package"
-sha1="2b2767a5ae0de30b9c7b840f2e34f5dd9deaf19a"
-targetFile="/tmp/$package"
-
-DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
-
-sudo yum -y install "$targetFile"
-rm "$targetFile"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh
deleted file mode 100755
index c1189a94..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh
+++ /dev/null
@@ -1,46 +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$
-##
-#############################################################################
-
-set -ex
-
-installPackages=()
-
-# For Jenkins
-installPackages+=(java-1.8.0-openjdk-devel)
-# For Qt Creator
-installPackages+=(openssl-devel)
-
-sudo yum -y install "${installPackages[@]}"
-
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
deleted file mode 100755
index d3072b37..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# provides: fix for possible bug in the subscription manager
-# version: provided by RedHat
-# needed for yum to work properly in case there is incorrect data in
-# the sslclientkey repository parameter value
-
-set -ex
-
-sudo rm -f /etc/pki/entitlement/*
-sudo subscription-manager refresh
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
deleted file mode 100755
index c8edc2a2..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# provides: odbc devel packages on RHEL
-# version: provided by default Linux distribution repository
-# needed for configure -plugin-sql-odbc in qtbase
-
-set -ex
-
-sudo yum install -y unixODBC-devel
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
deleted file mode 100755
index 2861821c..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
+++ /dev/null
@@ -1,51 +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$
-##
-#############################################################################
-
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-
-set -ex
-
-sudo yum install -y python-devel python-virtualenv
-
-# install python3
-sudo yum install -y python34-devel
-
-# install pip3
-wget https://bootstrap.pypa.io/get-pip.py
-sudo python3 get-pip.py
-sudo rm -f get-pip.py
-sudo pip3 install virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
deleted file mode 100755
index 74520b6e..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-"$(dirname "$0")/../common/linux/cmake_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh
deleted file mode 100755
index 4f1d3768..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
deleted file mode 100755
index b156e8f9..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# Required for tqtc-boot2qt/qdb
-
-set -ex
-
-sudo yum install -y libusb1-devel
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
deleted file mode 100755
index 505374c5..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite 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=../common/unix/mqtt_broker.sh
-source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
deleted file mode 100755
index 67c17954..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite 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 installs the right ICU version
-
-set -ex
-icuVersion="56.1"
-icuLocation="/usr/lib64"
-sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
-
-function Install7ZPackageFromURL {
- url=$1
- expectedSha1=$2
- targetDirectory=$3
-
- targetFile=$(mktemp)
- wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
- echo "$expectedSha1 $targetFile" | sha1sum --check
- sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile"
- rm "$targetFile"
-}
-
-echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
-
-baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
-Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64"
-
-echo "Installing custom ICU devel packages on RHEL"
-
-sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
-develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
-tempDir=$(mktemp -d)
-# shellcheck disable=SC2064
-trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir"
-sudo cp -a "$tempDir/lib"/* /usr/lib64
-sudo cp -a "$tempDir"/* /usr/
-
-sudo /sbin/ldconfig
-
-# Storage version information to ~/versions.txt, which is used to print version information to provision log.
-echo "ICU = $icuVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
deleted file mode 100755
index 1354bf6b..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite 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.
-
-# Storage installed RPM packages information
-
-set -ex
-
-# shellcheck disable=SC2129
-echo "*********************************************" >> ~/versions.txt
-echo "***** All installed RPM packages *****" >> ~/versions.txt
-rpm -q -a | sort >> ~/versions.txt
-echo "*********************************************" >> ~/versions.txt
-
-"$(dirname "$0")/../common/linux/version.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh
index 729f9003..729f9003 100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh
index 0a29d842..443bfa9e 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh
@@ -38,13 +38,13 @@ set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-package="epel-release-7-11.noarch.rpm"
+package="epel-release-7-12.noarch.rpm"
primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
-sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
+sha256="d6bb83c00ab3af26ded56459e7d6fceabfef66efbe0780b4dedbe81d62c07cd5"
targetFile="/tmp/$package"
-DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
+DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile"
sudo yum -y install "$targetFile"
rm "$targetFile"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh
deleted file mode 100755
index 729f9003..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/unix/telegraf_install.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh
deleted file mode 100755
index 729f9003..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/unix/telegraf_install.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
index 280e6b45..e7cf5c3d 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -47,11 +47,10 @@ done
function set_internal_repo {
sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
- deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
- deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
- deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse
- deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe
- deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse
+ deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse
+ deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse
+ deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe
+ deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse
EOC
}
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh
index 729f9003..729f9003 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh
deleted file mode 100755
index 729f9003..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/unix/telegraf_install.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh
deleted file mode 100755
index 08669e52..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/macos/increase_limits.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh
deleted file mode 100755
index 729f9003..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/unix/telegraf_install.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
deleted file mode 100755
index 52650fea..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
+++ /dev/null
@@ -1,41 +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$
-##
-#############################################################################
-
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/macos/sha1sum-compatibility.sh
-source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
deleted file mode 100755
index 3304cc3e..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# shellcheck source=../common/unix/disable-ntp_macos.sh
-source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh
deleted file mode 100755
index 2c3e45f3..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-set -ex
-
-# Read .bashrc if exist
-printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile
-
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
deleted file mode 100755
index ce8043fa..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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$
-##
-#############################################################################
-
-set -ex
-
-# This script modified system settings for automated use
-
-VNCPassword=qt
-NTS_IP=10.212.2.216
-
-echo "Disable Screensaver"
-# For current session
-defaults -currentHost write com.apple.screensaver idleTime 0
-
-echo "Disable sleep"
-sudo pmset sleep 0 displaysleep 0
-
-# For session after a reboot
-mkdir -p "$HOME/Library/LaunchAgents"
-cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-
-<plist version="1.0">
- <dict>
- <key>Label</key>
- <string>org.qt.io.screensaver_disable</string>
- <key>ProgramArguments</key>
- <array>
- <string>defaults</string>
- <string>-currentHost</string>
- <string>write</string>
- <string>com.apple.screensaver</string>
- <string>idleTime</string>
- <string>0</string>
- </array>
- <key>RunAtLoad</key>
- <true/>
- <key>KeepAlive</key>
- <false/>
- </dict>
-</plist>
-EOT
-
-defaults write com.apple.screensaver askForPassword -int 0
-
-echo "Set keyboard type rates and delays"
-# normal minimum is 15 (225 ms)
-defaults write -g InitialKeyRepeat -int 15
-# normal minimum is 2 (30 ms)
-defaults write -g KeyRepeat -int 2
-
-echo "Enable remote desktop sharing"
-sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all
-
-echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
-echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
-
-sudo systemsetup settimezone GMT
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh
deleted file mode 100755
index 8461c656..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-set -ex
-
-defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
deleted file mode 100755
index 67e2c1f6..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# shellcheck source=../common/macos/disable_spotlight.sh
-source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh
deleted file mode 100755
index 3c11214d..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-BASEDIR=$(dirname "$0")
-"$BASEDIR"/../common/macos/disable_update_downloads.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh
deleted file mode 100755
index 6e7c796a..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-set -ex
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-# Enables the usage of temporary keychains for SSL autotests
-SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
deleted file mode 100755
index 6e47f6a5..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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 installs XZ-Utils
-
-# XZ-Utils are needed for uncompressing xz-compressed files
-
-set -ex
-
-# 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"
-AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
-SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
-DestDir="/"
-
-InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
-
-echo "XZ = 5.0.7" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
deleted file mode 100755
index dcfcb93b..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/java.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
deleted file mode 100755
index 304eb0b6..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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 installs Xcode
-# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
-# This can be achieved by fetching Xcode_8.xip from Apple Store.
-# Uncompress it with 'xar -xf Xcode_8.xip'
-# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
-# with which you can run 'python parse_pbzx2.py Content'.
-# This will give you a file called "Content.part00.cpio.xz" that
-# can be renamed to Xcode_8.xz for this script.
-
-set -ex
-
-# shellcheck source=../common/macos/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
-
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2.tar.gz 9.2
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
deleted file mode 100755
index 1fa8b05d..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/macos/install-commandlinetools.sh
-source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-
-version="9.2"
-packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg"
-url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf"
-
-InstallCommandLineTools $url $url $sha1 $packageName $version
-
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
deleted file mode 100755
index 4f4d405e..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/cmake.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
deleted file mode 100755
index 06e984ec..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/homebrew.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
deleted file mode 100755
index a28e306f..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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 installs MySQL
-
-# MySQL is needed for Qt to be able to support MySQL
-
-set -ex
-
-# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz"
-AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
-SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
-appPrefix=""
-targetDir="/opt/mysql57/"
-
-sudo mkdir -p "/opt"
-
-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir"
-
-SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin"
-echo "MySQL = 5.7.15" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
deleted file mode 100755
index 9f79c594..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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 installs PostgreSQL
-
-# PostgreSQL is needed for Qt to be able to support PostgreSQL
-
-set -ex
-
-# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-psqlVersion="9.6.0"
-
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip"
-AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip"
-SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
-appPrefix=""
-
-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
-
-SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin"
-echo "PostgreSQL = $psqlVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
deleted file mode 100755
index 7ebb8825..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# shellcheck source=../common/macos/python2.sh
-source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
deleted file mode 100755
index eb2a4863..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# shellcheck source=../common/macos/python3.sh
-source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
deleted file mode 100755
index 2aedfe7b..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Install libiodbc
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/libiodbc.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh
deleted file mode 100755
index 1138ad3f..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Install 7z to be used from command line
-
-set -ex
-
-
-brew install p7zip
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
deleted file mode 100755
index eaabce82..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/virtualenv.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
deleted file mode 100755
index 33795b08..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-# There is only one mac package
-"$BASEDIR/../common/unix/libclang.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
deleted file mode 100755
index 34eefeb6..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/fbx_macos.sh"
-
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
deleted file mode 100755
index 44fa76f1..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/macos/install_openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
deleted file mode 100755
index 5bc77ad3..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env sh
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Install tools for singing packages
-# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
-
-set -ex
-
-cache="http://ci-files01-hki.intra.qt.io/input"
-cacheSigningTools="$cache/mac/sign_tools"
-targetFolder="/Users/qt"
-keychains="$targetFolder/Library/Keychains"
-
-Install() {
-
- url=$1
- targetFile=$2
- expectedSha1=$3
-
- echo "Fetching $targetFile from $url..."
- curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
- shasum "$targetFile" |grep "$expectedSha1"
-
-}
-
-# qt-license
-sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
-Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
-
-# Login keychain
-sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
-Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt")
-loginKeychain=$keychains/login.keychain
-
-echo "Setting login.keychain as default keychain.."
-security default-keychain -s $loginKeychain*
-echo "Unlocking Login keychain with password.."
-security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*
-
-echo "remove the "Lock after X minutes of inactivity" from login.keychain"
-security set-keychain-settings $loginKeychain
-
-# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
-sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
-Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
-sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
-
-# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
-sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
-Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
-sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
-
-# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
-sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
-unlockKeychain=$targetFolder/unlock-keychain.sh
-Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain
-sudo chmod 755 "$unlockKeychain"
-
-# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
-shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
-csreq=$targetFolder/csreq_qt_company.txt
-Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
-chmod 755 "$csreq"
-
-# iOS signing tools
-devIDKeychain="Developer_ID_TheQtCompany.keychain"
-shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca"
-Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
-echo "Opening $devIDKeychain.."
-open "$keychains/$devIDKeychain"
-
-sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
-Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
-
-echo "Unlocking $devIDKeychain with password.."
-security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
-security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
-
-sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
-Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
-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
-
-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
-
-# Mobileprovision
-echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
-mkdir "$targetFolder/Library/MobileDevice"
-mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
-shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf"
-Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
-
-# Removing password files
-rm -fr "$targetFolder/login_keychain_password.txt"
-
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
deleted file mode 100755
index 17a0c38e..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/squishInstall.sh"
-
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh
deleted file mode 100755
index 99d94150..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/macos-version.sh
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh
index d91316bd..95631107 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## 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.
@@ -37,7 +37,13 @@ set -ex
# This script modified system settings for automated use
-VNCPassword=qt
+targetFile="$HOME/vncpw.txt"
+
+# Fetch password
+curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile"
+shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0"
+
+{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null
NTS_IP=10.212.2.216
echo "Disable Screensaver"
@@ -82,10 +88,13 @@ defaults write -g InitialKeyRepeat -int 15
# normal minimum is 2 (30 ms)
defaults write -g KeyRepeat -int 2
+set +x
echo "Enable remote desktop sharing"
sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all
+set -x
echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
sudo systemsetup settimezone GMT
+sudo rm -f "$targetFile"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
index 1ab68fec..510ce59b 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1_updated.tar.gz 10.1
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh
index 817e3858..79eba834 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## 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.
@@ -37,7 +37,13 @@ set -ex
# This script modified system settings for automated use
-VNCPassword=qt
+targetFile="$HOME/vncpw.txt"
+
+# Fetch password
+curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile"
+shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0"
+
+{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null
NTS_IP=10.212.2.216
echo "Disable Screensaver"
@@ -82,11 +88,14 @@ defaults write -g InitialKeyRepeat -int 15
# normal minimum is 2 (30 ms)
defaults write -g KeyRepeat -int 2
+set +x
echo "Enable remote desktop sharing"
sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all
+set -x
echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
sudo systemsetup settimezone GMT
sudo systemsetup setusingnetworktime off
+sudo rm -f "$targetFile"
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh
index ebeadc02..2ee4dedf 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh
index cf312ed2..57a86c47 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh
@@ -2,5 +2,6 @@
set -ex
-# shellcheck source=../common/macos/install_openssl_111a.sh
-source "${BASH_SOURCE%/*}/../common/macos/install_openssl_111a.sh"
+# shellcheck source=../common/macos/install_openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos"
+
diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1
new file mode 100644
index 00000000..1dc08d21
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1
new file mode 100644
index 00000000..1dc08d21
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1
new file mode 100644
index 00000000..1dc08d21
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1"
diff --git a/qt3d b/qt3d
-Subproject 67f7a83d935539e185b4bf26e7c1c79e254497a
+Subproject c2ea752f684290d156c500c6a7174fe3f27fa08
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 855c01603e19a78cb73421d4a5c2410c4ad31c3
+Subproject 35bb7f3d233bd2016a477d3ea473c388cdd4b6a
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 9ee2af5485f02cbd4cd88cc02ab147f830007a7
+Subproject efae79e4cc95bb8fdb3ac6f3af5366913d0060f
diff --git a/qtbase b/qtbase
-Subproject bf8fcab8bb92ff534c5cec048d6dbebb3b73a34
+Subproject dff3843d98d52e2c32fea07371f91117de0667e
diff --git a/qtcharts b/qtcharts
-Subproject a5d54eb0efd0155174e6b69bb6c4c069d20e99f
+Subproject e948e0c9f1e9bc096ada6e1d854177f5689ce1a
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 75bb24bf9efc771d8462a3ee69ace6b398f8515
+Subproject 60645c1ae0ceb6bdb81e5c4ce1c7efbf215e09e
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject a54a5a253fce25d0ffa215996a3cdf2fca8b06b
+Subproject 78befdb83f801cb0c4d87a5b64b5554fc2bbb71
diff --git a/qtdeclarative b/qtdeclarative
-Subproject bdf0a46c289298f7378796d62ae5fb283e08657
+Subproject 033e797aa5c58bb8f306f82292da272e60fa2fa
diff --git a/qtdoc b/qtdoc
-Subproject c3a3c01c7f4df8cbdcf328cfb76f530c90f4281
+Subproject e8db0ff104b71cc53da0a7edc50e07579115c51
diff --git a/qtgamepad b/qtgamepad
-Subproject 301af00942b710d8157a916907e2c8324f2502c
+Subproject 5fe6fd206f4aef1cb1ee9c328ee27e25e6b44f4
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 446eb21ff4a6787169c9ef4f9e9ebd531ce58c7
+Subproject 261f68697af0310abbfec2f9fee710d1a121d2d
diff --git a/qtimageformats b/qtimageformats
-Subproject e6ab94c607d8bc078e3d6ba776aa2b69a144846
+Subproject b9b0e50aa3b7ff7c4b39bdb84e6c0b8027447fb
diff --git a/qtlocation b/qtlocation
-Subproject 2b743cdca353f84959dac47e4ca24615c6f1830
+Subproject 4331bee772dfbb846c0c447357b7d0f4cb43506
diff --git a/qtlottie b/qtlottie
-Subproject 5891e5d7f5b1134a184fb82926c10866257f1f6
+Subproject 27bcfc703ebbe09dc753683241fad84bd6f6a9f
diff --git a/qtmacextras b/qtmacextras
-Subproject d1c4e8d6e4dd6200e9c3371e43b63e18911a9cc
+Subproject e8a235fb0eb6b14e8ce7d816535dec1c927e87e
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 18e6110dfdfd62cc0032f8e43586d075f15299f
+Subproject b537049f40e46a7892214f4593ca70c80d60907
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject f8a654dc99a45078483ac038bd42c8df5412964
+Subproject 8cf875f3c495bec30622526d19dd8111d7fba6c
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 689db87975134dc7332cf32ce2afe96d8a5211a
+Subproject 29b8e7a664038b40be0fd04f839e1b382db0831
diff --git a/qtqa b/qtqa
-Subproject 3cbc0456a5c238c755e47c49ee4b047836eae5e
+Subproject c6412a34f038310117bdb284cbfbdbca5f19067
diff --git a/qtquick3d b/qtquick3d
-Subproject 81ec0f5a7e81b38315f62c9f064760b85a3bb29
+Subproject 987ef729be84ac970afb768c4a3dcc37e75fbe8
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 61463e781f1892f11a45f9c924aa9b5dbbb359f
+Subproject d25989845394b6a9a2c103e5c70768e57083e18
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 72149cbb6fe7b1e6af4018c945ece738f8ad0a1
+Subproject 70f881e429d19948c80387912c51da53a2309b2
diff --git a/qtquicktimeline b/qtquicktimeline
-Subproject 5651ee826fa129f5d893ee280d83c1cf2aa7eb2
+Subproject 4b1c80a322bc46836e37650afceb05f90bc345d
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject a23672bad7e28cc0b9c573ad6909e15a4639065
+Subproject c603dac09f0099fd9a6482fb315e2c069a7ef5a
diff --git a/qtrepotools b/qtrepotools
-Subproject 17750ded9db8cb355e3219b9c2ff29f038d163b
+Subproject 1bf0cbf1e48bb768f50e93cf112d81d423322e3
diff --git a/qtscript b/qtscript
-Subproject 19a5026113c88ed1be83ed7c18f56c19daeea8d
+Subproject 957fe147f133043cd5524323cb72da70389008d
diff --git a/qtscxml b/qtscxml
-Subproject 1b555247e953d9be2b442f281698df475ad9fff
+Subproject 103c52661f468733b64747c847308b2c45449dc
diff --git a/qtsensors b/qtsensors
-Subproject 3935d25914a98615ef1e857efb568da1c6db1ef
+Subproject 5403d0f8175f2e0d7e04fe6fafa2a7660908b5c
diff --git a/qtserialbus b/qtserialbus
-Subproject d59e2a4b72154b64e1d26fd1068933b8a25da77
+Subproject a44ad0513f3a022f245d47ee513f1103fd06c2b
diff --git a/qtserialport b/qtserialport
-Subproject cb8cf3e7fd7a4ea39c25057c59888112e342ee6
+Subproject f597317dbf605ecc9391825ef27f52812fea069
diff --git a/qtspeech b/qtspeech
-Subproject bcca555e7227a0e651dd27dcb61bb5ae0f0b9c6
+Subproject 25c1b5b74cc96ceaefeed6be76cda402f406a23
diff --git a/qtsvg b/qtsvg
-Subproject 7831afe0d496794cdc7a7ffbf1b374120941c3e
+Subproject 2960c9d0d9feaae5fb8b2fc04da267b43d23826
diff --git a/qttools b/qttools
-Subproject cbb56d8dab2447ce8fda454e6c6cd6938dffacb
+Subproject a3e97fb5c0d87187d16cbb21ec2254ab2f45550
diff --git a/qttranslations b/qttranslations
-Subproject ab5af4c676b80a69e0f1b8459d4c081a43f6331
+Subproject a69268af181c412e21de88efd1d903de4457e19
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 92404f740116f29866e9f91505d94a2be6dd23e
+Subproject 50f1b28991b7c8207d6b999478d88ffb528ff79
diff --git a/qtwayland b/qtwayland
-Subproject d4451738825e4f2ae8700796b6166d93f23b2c8
+Subproject bf014dc5ab94bdd40ad7d07e18133181b0c636e
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 869a1a5f7321dcd3fdd57735fb503a6d3506c61
+Subproject e1c7e036431aa0da365dbdd8be7ce723cd72c7d
diff --git a/qtwebengine b/qtwebengine
-Subproject 7268797ab9e32de7497f13ffa9820c49d8cb3e4
+Subproject d82ff4e1d1a93bf0a31745a5454346ac54959cf
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject 5f7bd72592576bb193592702a26a8b0288642a5
+Subproject 531fb30d539f09003946ab768873ef87e6117fa
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 4f29e93b157ed6e4e264297d27a8e1c006e098a
+Subproject 9f824f8fd08642c5099c9a032628314858ce7fe
diff --git a/qtwebview b/qtwebview
-Subproject 64f9899781446d73e6ccc42021d4efbd8d1feb8
+Subproject dfbe1343cd7d34a5fa3c9854568cc28e265df15
diff --git a/qtwinextras b/qtwinextras
-Subproject 23fb8fa7d3894d5f93ec5d51461e1366274a0c0
+Subproject 18cf8f3120ab8b5522b1fe0846c3f1659bfc33f
diff --git a/qtx11extras b/qtx11extras
-Subproject 82d4d38d2037ae36b38fe81916b14feb4068972
+Subproject 76e206e0a30d2c6532b9b5c6cf98d83d7b97d66
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 3101514787f7f3a451514b2ef3fc6e7bcfe1f0c
+Subproject 05ab44484453673ee813bcac287fc9052ec9164