summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules86
-rw-r--r--coin/module_config.yaml10
-rw-r--r--coin/platform_configs/default.yaml117
-rw-r--r--coin/platform_configs/meta-boot2qt.yaml40
-rw-r--r--coin/platform_configs/ogl-runtime.yaml1
-rw-r--r--coin/platform_configs/qt3d-runtime.yaml1
-rw-r--r--coin/platform_configs/qt5.yaml106
-rw-r--r--coin/platform_configs/qtbase.yaml20
-rw-r--r--coin/platform_configs/qtdeclarative.yaml24
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml14
-rw-r--r--coin/platform_configs/qtsdk.yaml13
-rw-r--r--coin/platform_configs/qtwebkit.yaml5
-rw-r--r--coin/platform_configs/tqtc-qt-rta.yaml14
-rwxr-xr-xcoin/provisioning/common/shared/testserver/docker_images.sh14
-rwxr-xr-xcoin/provisioning/common/unix/python_modules.sh4
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh8
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps110
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh2
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
63 files changed, 406 insertions, 85 deletions
diff --git a/.gitmodules b/.gitmodules
index c370f18a..ef01576e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,47 +1,47 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = wip/cmake
+ branch = dev
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = wip/cmake
+ branch = dev
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = dev
- status = ignore
+ status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = dev
- status = ignore
+ status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = wip/cmake
+ branch = dev
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
@@ -49,13 +49,13 @@
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = dev
- status = ignore
+ status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = dev
- status = ignore
+ status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative qttools
@@ -63,7 +63,7 @@
path = qtdoc
url = ../qtdoc.git
branch = dev
- status = ignore
+ status = essential
priority = 40
[submodule "qtrepotools"]
path = qtrepotools
@@ -76,7 +76,7 @@
path = qtqa
url = ../qtqa.git
branch = master
- status = ignore
+ status = essential
priority = 50
[submodule "qtlocation"]
depends = qtbase
@@ -84,14 +84,14 @@
path = qtlocation
url = ../qtlocation.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtsystems"]
depends = qtbase
recommends = qtdeclarative
@@ -123,7 +123,7 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtwayland"]
depends = qtbase
@@ -131,25 +131,25 @@
path = qtwayland
url = ../qtwayland.git
branch = dev
- status = ignore
+ status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
@@ -157,51 +157,51 @@
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtwebchannel"]
depends = qtbase
@@ -209,14 +209,14 @@
path = qtwebchannel
url = ../qtwebchannel.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = dev
- status = ignore
+ status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
@@ -230,13 +230,13 @@
path = qtwebview
url = ../qtwebview.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = wip/cmake
+ branch = dev
status = essential
[submodule "qtpurchasing"]
depends = qtbase
@@ -244,40 +244,40 @@
path = qtpurchasing
url = ../qtpurchasing.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtspeech"]
depends = qtbase
@@ -285,19 +285,19 @@
path = qtspeech
url = ../qtspeech.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
- branch = wip/cmake
+ branch = dev
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
@@ -305,22 +305,22 @@
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = dev
- status = ignore
+ status = preview
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = dev
- status = ignore
+ status = preview
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = dev
- status = ignore
+ status = preview
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
deleted file mode 100644
index d10eb769..00000000
--- a/coin/module_config.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 1
-accept_configuration:
- condition: property
- property: host.os
- equals_property: target.os
-
-build_instructions:
- - type: EnvironmentVariable
- variableName: Dummy
- variableValue: dummy
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 46fe6ecd..753578a2 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,30 +1,123 @@
Version: 2
+Module only: True
Configurations:
-
+ Template: 'qtci-windows-7-x86-3'
+ Compiler: 'Mingw73'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ 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%'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Compiler: 'MSVC2019'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
+-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
- Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON'
+ 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'
+ Features: ['OutOfSourceBuild', 'Documentation']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Compiler: 'ICC_18'
- Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
- Template: 'qtci-macos-10.13-x86_64-2'
- Compiler: 'Clang'
- Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12'
+ Template: 'qtci-linux-openSUSE-15.0-x86_64'
+ Target os: 'WebAssembly'
+ Compiler: 'GCC'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
-
- Template: 'qtci-windows-10-x86_64-15'
- Compiler: 'MSVC2019'
- Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
+ Template: 'qtci-linux-SLES-15-x86_64'
+ Compiler: 'GCC'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
- Configure arguments: '-DBUILD_EXAMPLES=OFF'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
+-
+ Template: 'qtci-macos-10.13-x86_64-2'
+ Compiler: 'Clang'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -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 -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
+-
+ Template: 'qtci-macos-10.14-x86_64'
+ 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.14-x86_64'
+ Target os: 'IOS_ANY'
+ Target arch: 'multi'
+ Compiler: 'Clang'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
+-
+ Template: 'qtci-macos-10.14-x86_64'
+ Target os: 'TvOS_ANY'
+ Target arch: 'multi'
+ Compiler: 'Clang'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
+-
+ Template: 'qtci-macos-10.14-x86_64'
+ Target os: 'WatchOS_ANY'
+ Target arch: 'multi'
+ Compiler: 'Clang'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'Android_ANY'
+ Target arch: 'multi'
+ 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-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-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'armv7'
+ Compiler: 'GCC'
+ Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
- Target compiler: 'Clang'
- Configure arguments: '-DBUILD_EXAMPLES=OFF'
- Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU']
+ Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'mips64'
+ Compiler: 'GCC'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'GCC'
+ Features: ['TestOnly', 'LicenseCheck']
+-
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Target os: 'QNX_700'
+ Target arch: 'armv7'
+ Compiler: 'GCC'
+ Features: ['Packaging', 'DisableTests']
+ 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/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml
new file mode 100644
index 00000000..95cc79c4
--- /dev/null
+++ b/coin/platform_configs/meta-boot2qt.yaml
@@ -0,0 +1,40 @@
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET1'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET2'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET3'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET4'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET5'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET6'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET7'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET8'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET9'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'Yocto'
+ Target arch: 'TARGET10'
diff --git a/coin/platform_configs/ogl-runtime.yaml b/coin/platform_configs/ogl-runtime.yaml
new file mode 100644
index 00000000..c1ec5493
--- /dev/null
+++ b/coin/platform_configs/ogl-runtime.yaml
@@ -0,0 +1 @@
+qt5.yaml
diff --git a/coin/platform_configs/qt3d-runtime.yaml b/coin/platform_configs/qt3d-runtime.yaml
new file mode 100644
index 00000000..c1ec5493
--- /dev/null
+++ b/coin/platform_configs/qt3d-runtime.yaml
@@ -0,0 +1 @@
+qt5.yaml
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
new file mode 100644
index 00000000..e1d20a71
--- /dev/null
+++ b/coin/platform_configs/qt5.yaml
@@ -0,0 +1,106 @@
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'WinRT_10'
+ Compiler: 'MSVC2015'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'WinRT_10'
+ Target arch: 'x86'
+ Compiler: 'MSVC2017'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017'
+-
+ Template: 'qtci-windows-7-x86-3'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'WinRT_10'
+ Target arch: 'armv7'
+ Compiler: 'MSVC2017'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'WinRT_10'
+ Compiler: 'MSVC2017'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'Android_ANY'
+ Target arch: 'multi'
+ 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'
+-
+ Template: 'qtci-macos-10.13-x86_64-2'
+ Target os: 'Android_ANY'
+ Target arch: 'multi'
+ 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'
+-
+ 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 -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-15'
+ Target os: 'QNX_700'
+ Target arch: 'armv7'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'QNX_700'
+ Target arch: 'armv8'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Target os: 'QNX_700'
+ Target arch: 'x86_64'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc'
+-
+ 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 -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 -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-15'
+ Target os: 'WebAssembly'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
+-
+ Template: 'qtci-macos-10.13-x86_64-2'
+ Target os: 'WebAssembly'
+ Compiler: 'Clang'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -xplatform wasm-emscripten'
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
new file mode 100644
index 00000000..cb45370a
--- /dev/null
+++ b/coin/platform_configs/qtbase.yaml
@@ -0,0 +1,20 @@
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'armv7'
+ Compiler: 'GCC'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'arm64'
+ Compiler: 'GCC'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-openSUSE-15.0-x86_64'
+ Target os: 'WebAssembly'
+ Compiler: 'GCC'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'
diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml
new file mode 100644
index 00000000..161875d8
--- /dev/null
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -0,0 +1,24 @@
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'armv7'
+ Compiler: 'GCC'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'arm64'
+ Compiler: 'GCC'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'armv7'
+ Compiler: 'GCC'
+ Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose'
+-
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Target os: 'QEMU'
+ Target arch: 'arm64'
+ Compiler: 'GCC'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb'
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
new file mode 100644
index 00000000..be14923b
--- /dev/null
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -0,0 +1,14 @@
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Compiler: 'Mingw73'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
+-
+ Template: 'qtci-windows-10-x86_64-15'
+ Compiler: 'Mingw73'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
+-
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Compiler: 'GCC'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml
new file mode 100644
index 00000000..754e8492
--- /dev/null
+++ b/coin/platform_configs/qtsdk.yaml
@@ -0,0 +1,13 @@
+-
+ Template: 'qtci-windows-10-x86-3'
+ Compiler: 'MSVC2017'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
+-
+ Template: 'qtci-linux-RHEL-6.6-x86_64'
+ 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/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml
new file mode 100644
index 00000000..0a1d5d31
--- /dev/null
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -0,0 +1,5 @@
+-
+ 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++'
diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml
new file mode 100644
index 00000000..76664d06
--- /dev/null
+++ b/coin/platform_configs/tqtc-qt-rta.yaml
@@ -0,0 +1,14 @@
+-
+ Template: 'qtci-windows-7-x86_64-4'
+ Compiler: 'MSVC2013'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
+-
+ Template: 'qtci-windows-8.1-x86_64'
+ Compiler: 'MSVC2013'
+ Features: ['DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
+-
+ Template: 'qtci-windows-10-x86-3'
+ Compiler: 'MSVC2017'
+ 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/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh
index e98183d8..1d467f7b 100755
--- a/coin/provisioning/common/shared/testserver/docker_images.sh
+++ b/coin/provisioning/common/shared/testserver/docker_images.sh
@@ -51,18 +51,20 @@ sha1tree () {
sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
}
-# Using SHA-1 of each server context as the tag of docker images. A tag labels a
-# specific image version. It is used by docker compose file (docker-compose.yml)
-# to launch the corresponding docker containers. If one of the server contexts
-# (./apache2, ./danted, ...) gets changes, all the related compose files in
-# qtbase should be updated as well.
+# A tag labels a specific image version. In the docker compose file
+# (docker-compose.yml) that launches the containers, the tag used is
+# "latest". Here the images are also tagged with the SHA1 of each server
+# context, so if needed we can modify docker-compose.yml to launch a very
+# specific image, thus providing a way to stage backwards-incompatible changes
+# across repositories.
source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="$SERVER_PATH/$server"
- docker build -t qt-test-server-$server:$(sha1tree $context) $context
+ tag=$(sha1tree $context)
+ docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context
done
docker images
diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh
index dbf26a85..89adbd5c 100755
--- a/coin/provisioning/common/unix/python_modules.sh
+++ b/coin/provisioning/common/unix/python_modules.sh
@@ -34,5 +34,5 @@
#############################################################################
# needed by packaging scripts
-sudo pip3 install bs4
-sudo pip3 install sh
+pip3 install bs4
+pip3 install sh
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index f1b5e6b5..24a4d507 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -38,14 +38,14 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
-version="6.4.3"
+version="6.5"
# Branch version without dot
-qtBranch="512x"
+qtBranch="513x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
-squishFile="squish-$version-qt$qtBranch-linux64.run"
+squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run"
if uname -a |grep -q Darwin; then
- squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
+ squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg"
fi
squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 2cc45785..f8d600d7 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -38,10 +38,10 @@
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
-$version = "6.4.3"
+$version = "6.5"
# Qt branch without dot (*.*)
-$qtBranch = "512x"
+$qtBranch = "513x"
# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
@@ -62,11 +62,7 @@ Function DownloadAndInstallSquish {
[string]$bit,
[string]$squishPackage
)
- # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
- if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
- $qtBranch = "511x"
- }
- $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
+ $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
index 080bc43b..7c9520d7 100755
--- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
@@ -35,7 +35,7 @@
set -ex
-sudo zypper -nq install git gcc gcc-c++
+sudo zypper -nq install git gcc gcc-c++ ninja
sudo zypper -nq install bison flex gperf \
zlib-devel \
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 38b4a100..15d41b8a 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
@@ -169,6 +169,8 @@ installPackages+=(git-lfs)
installPackages+=(chrpath)
installPackages+=(gawk)
installPackages+=(texinfo)
+# Needed for Poppler test in QtWebEngine
+installPackages+=(libpoppler-cpp-dev)
# Needed for QtCore
installPackages+=(libdouble-conversion-dev)
installPackages+=(libpcre2-dev)
diff --git a/qt3d b/qt3d
-Subproject 299c0bc6d2ea5817ba32b3724290c349789be11
+Subproject c2ea752f684290d156c500c6a7174fe3f27fa08
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 3832b74aca592f8edf4cc54867d0a56334e797e
+Subproject 35bb7f3d233bd2016a477d3ea473c388cdd4b6a
diff --git a/qtandroidextras b/qtandroidextras
-Subproject fe09a2dc3edb4b9a4377b25847f0c684c17fcc1
+Subproject efae79e4cc95bb8fdb3ac6f3af5366913d0060f
diff --git a/qtbase b/qtbase
-Subproject 6c20ae774cda49fc233125768b806447669f426
+Subproject dff3843d98d52e2c32fea07371f91117de0667e
diff --git a/qtcharts b/qtcharts
-Subproject 40149204fe6df6c7bcee1d215b277d4553b385f
+Subproject e948e0c9f1e9bc096ada6e1d854177f5689ce1a
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 6478208ef9bfe24618cae383663163b894dd5e3
+Subproject 60645c1ae0ceb6bdb81e5c4ce1c7efbf215e09e
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 452cac276b493b6e9d6f1864eecaa97250cefd8
+Subproject 78befdb83f801cb0c4d87a5b64b5554fc2bbb71
diff --git a/qtdeclarative b/qtdeclarative
-Subproject f500062e165975e112ea644da1d6a3d4c413be2
+Subproject 033e797aa5c58bb8f306f82292da272e60fa2fa
diff --git a/qtdoc b/qtdoc
-Subproject c2eb165e4cad518fa3a0660588199144477fb30
+Subproject e8db0ff104b71cc53da0a7edc50e07579115c51
diff --git a/qtgamepad b/qtgamepad
-Subproject 85d4181dd9786eab1837bd50880183b38934e0e
+Subproject 5fe6fd206f4aef1cb1ee9c328ee27e25e6b44f4
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 936be561e4b2d28b51a1c1a9dae4b7baf1f932e
+Subproject 261f68697af0310abbfec2f9fee710d1a121d2d
diff --git a/qtimageformats b/qtimageformats
-Subproject 4c932c40349d837592c6c429fabf2511596e0fd
+Subproject b9b0e50aa3b7ff7c4b39bdb84e6c0b8027447fb
diff --git a/qtlocation b/qtlocation
-Subproject c8771162fca507caaf3c1881ac26e47593608b6
+Subproject 4331bee772dfbb846c0c447357b7d0f4cb43506
diff --git a/qtlottie b/qtlottie
-Subproject 0278037c6a91a916f790971eafbc2ca0f8a9e4a
+Subproject 27bcfc703ebbe09dc753683241fad84bd6f6a9f
diff --git a/qtmacextras b/qtmacextras
-Subproject c4353f2fbcc444aa349648e1c23e49156ae5946
+Subproject e8a235fb0eb6b14e8ce7d816535dec1c927e87e
diff --git a/qtmultimedia b/qtmultimedia
-Subproject bb1fde2553fa05de0603df96dcd9d60cecc8548
+Subproject bb64e9df20003d705820544f55b081d22bd6287
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject d8b2f7aba3ab58914db6fb0b5234225db1402b1
+Subproject 8cf875f3c495bec30622526d19dd8111d7fba6c
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 5b705a2b6896f8b613ad1e3120696ec0f81885e
+Subproject 29b8e7a664038b40be0fd04f839e1b382db0831
diff --git a/qtqa b/qtqa
-Subproject 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4a
+Subproject c6412a34f038310117bdb284cbfbdbca5f19067
diff --git a/qtquick3d b/qtquick3d
-Subproject ef675a99da6f729e36d0d2f1802de3b857db362
+Subproject 987ef729be84ac970afb768c4a3dcc37e75fbe8
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject f984a80d055e4c9bbd2224d0db54f4233838591
+Subproject d25989845394b6a9a2c103e5c70768e57083e18
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 2bd4f5cd587e258227c69b3124757d7b8e019c9
+Subproject 70f881e429d19948c80387912c51da53a2309b2
diff --git a/qtquicktimeline b/qtquicktimeline
-Subproject 5651ee826fa129f5d893ee280d83c1cf2aa7eb2
+Subproject 4b1c80a322bc46836e37650afceb05f90bc345d
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 3707937ca78d21a21aecd0e671821dd4759cf38
+Subproject c603dac09f0099fd9a6482fb315e2c069a7ef5a
diff --git a/qtrepotools b/qtrepotools
-Subproject fa4ab96e757b72096b5e67fd636e128f8d8afe8
+Subproject 1bf0cbf1e48bb768f50e93cf112d81d423322e3
diff --git a/qtscript b/qtscript
-Subproject 54176314d1c06ef387e797258cfc3993274665c
+Subproject 957fe147f133043cd5524323cb72da70389008d
diff --git a/qtscxml b/qtscxml
-Subproject 804fb1f97a713edc96435433d15b09a3cb67041
+Subproject 103c52661f468733b64747c847308b2c45449dc
diff --git a/qtsensors b/qtsensors
-Subproject ae5af8baa9c0323f1908a6d218c28f9c504bc77
+Subproject 5403d0f8175f2e0d7e04fe6fafa2a7660908b5c
diff --git a/qtserialbus b/qtserialbus
-Subproject a3e6b5b9617d2f87e00158ae4b15e8db3e9c656
+Subproject a44ad0513f3a022f245d47ee513f1103fd06c2b
diff --git a/qtserialport b/qtserialport
-Subproject 4131118d849ef01c5a1f10ac0791088aec11b26
+Subproject f597317dbf605ecc9391825ef27f52812fea069
diff --git a/qtspeech b/qtspeech
-Subproject 0b7c9acbafbfe32f6ccb254b7ec656fac6fb189
+Subproject 25c1b5b74cc96ceaefeed6be76cda402f406a23
diff --git a/qtsvg b/qtsvg
-Subproject 25ca99752c46e4266e6a90c31a9fb9e9fa4e5f5
+Subproject 2960c9d0d9feaae5fb8b2fc04da267b43d23826
diff --git a/qttools b/qttools
-Subproject 0936765801ec9ad4710e94ea788515e498315bd
+Subproject a3e97fb5c0d87187d16cbb21ec2254ab2f45550
diff --git a/qttranslations b/qttranslations
-Subproject 66952c79bc648e1074936dddb7fa2cffc17b177
+Subproject a69268af181c412e21de88efd1d903de4457e19
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 3744d0c3c961049a84023b7f8567e48196475b2
+Subproject 50f1b28991b7c8207d6b999478d88ffb528ff79
diff --git a/qtwayland b/qtwayland
-Subproject c9970025bc912c6d3b2fe6183762c6f254e84ae
+Subproject bf014dc5ab94bdd40ad7d07e18133181b0c636e
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 8b701450aeceb878784879eaf65dc42d5befd3a
+Subproject e1c7e036431aa0da365dbdd8be7ce723cd72c7d
diff --git a/qtwebengine b/qtwebengine
-Subproject bbd11d8da5c52c5c76a6657d884d2e648e41010
+Subproject cda76002257d56ffedbf8d28211cfd66a7226e7
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject bd97e6e554c21144cadc9e047fa7d5f22f5f32b
+Subproject 531fb30d539f09003946ab768873ef87e6117fa
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 5fc2b148cfa763007810d7b6256ea50d82bf7e4
+Subproject 9f824f8fd08642c5099c9a032628314858ce7fe
diff --git a/qtwebview b/qtwebview
-Subproject f8c190945d7b3679db5a322de8e49acc88748c7
+Subproject dfbe1343cd7d34a5fa3c9854568cc28e265df15
diff --git a/qtwinextras b/qtwinextras
-Subproject 9e1569de0f68530669e56cdb78061858d2db746
+Subproject 18cf8f3120ab8b5522b1fe0846c3f1659bfc33f
diff --git a/qtx11extras b/qtx11extras
-Subproject 7540e57ea709459bd15c16d25535bb756392f92
+Subproject 76e206e0a30d2c6532b9b5c6cf98d83d7b97d66
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject bc4290cde83470dd72eb49e8cf6275f7b7a70f3
+Subproject 05ab44484453673ee813bcac287fc9052ec9164