Merge "Merge remote-tracking branch 'origin/5.13' into dev"

23 files changed, 432 insertions, 111 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
deleted file mode 100644
index 77f23f05..00000000
--- a/coin/platform_configs/default.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Template                            Target OS           Target arch Compiler    Target Compiler Features                             Configure arguments
------------------------------------ ------------------- ----------- ----------- --------------- ------------------------------------ ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-14                                           MSVC2015                                                         -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%
-qtci-windows-7-x86-3                                                Mingw73                                                          -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++
-qtci-windows-10-x86_64-14                               x86         MSVC2017                    Packaging                            -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -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%
-qtci-windows-10-x86_64-14                                           MSVC2015                    Packaging                            -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%
-qtci-windows-10-x86_64-14           WinRT_10            x86         MSVC2015                    Packaging DisableTests               -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015
-qtci-windows-10-x86_64-14           WinRT_10            armv7       MSVC2015                    Packaging DisableTests               -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info  -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015
-qtci-windows-10-x86_64-14                                           MSVC2017                    Packaging                            -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                                                              -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         OutOfSourceBuild Documentation       -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl
-qtci-linux-openSUSE-15.0-x86_64                                     GCC                                                              -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R .
-qtci-linux-openSUSE-15.0-x86_64                                     ICC_18                      DisableTests                         -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl
-qtci-linux-openSUSE-15.0-x86_64     WebAssembly                     GCC                         Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors
-qtci-linux-RHEL-7.6-x86_64                                          GCC                         Packaging                            -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl
-qtci-macos-10.13-x86_64-2                                           Clang                       Packaging                            -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include
-qtci-macos-10.12-x86_64-9                                           Clang                                                            -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include
-qtci-macos-10.13-x86_64-2           IOS_ANY             multi       Clang                       Packaging DisableTests               -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite
-qtci-macos-10.13-x86_64-2           TvOS_ANY            multi       Clang                       DisableTests                         -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite
-qtci-macos-10.13-x86_64-2           WatchOS_ANY         multi       Clang                       DisableTests                         -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite
-qtci-linux-RHEL-7.6-x86_64          Android_ANY         armv7       Clang       Clang           Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a
-qtci-linux-RHEL-7.6-x86_64          Android_ANY         arm64       Clang       Clang           Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                armv7       GCC                                                              -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                arm64       GCC                                                              -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -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
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                mips64      GCC                         DisableTests                         -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -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 -no-xcb
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         TestOnly LicenseCheck
-qtci-linux-RHEL-7.6-x86_64          INTEGRITY_11_04     armv7       GCC                         DisableTests                         -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests
-qtci-linux-RHEL-7.6-x86_64          QNX_700             armv7       GCC                         Packaging DisableTests               -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
new file mode 100644
index 00000000..8de9e023
--- /dev/null
+++ b/coin/platform_configs/default.yaml
@@ -0,0 +1,154 @@
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    Compiler: 'MSVC2015'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
+-
+    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-14'
+    Target arch: 'x86'
+    Compiler: 'MSVC2017'
+    Features: ['Packaging']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    Compiler: 'MSVC2015'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    Target os: 'WinRT_10'
+    Target arch: 'x86'
+    Compiler: 'MSVC2015'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    Target os: 'WinRT_10'
+    Target arch: 'armv7'
+    Compiler: 'MSVC2015'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
+-
+    Template: 'qtci-windows-10-x86_64-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%'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    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-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    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: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-openSUSE-15.0-x86_64'
+    Compiler: 'ICC_18'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-openSUSE-15.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-linux-RHEL-7.6-x86_64'
+    Compiler: 'GCC'
+    Features: ['Packaging']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    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 -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
+-
+    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 -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
+-
+    Template: 'qtci-macos-10.12-x86_64-9'
+    Compiler: 'Clang'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    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.13-x86_64-2'
+    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.13-x86_64-2'
+    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: '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-r19c -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: '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-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
+-
+    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 -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/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+    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 -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'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck']
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Target os: 'INTEGRITY_11_04'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6'
+-
+    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 -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'
diff --git a/coin/platform_configs/meta-boot2qt.txt b/coin/platform_configs/meta-boot2qt.txt
deleted file mode 100644
index dbf41fcf..00000000
--- a/coin/platform_configs/meta-boot2qt.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Template                       Target OS Target arch Compiler Target Compiler Features Configure arguments
------------------------------- --------- ----------- -------- --------------- -------- -------------------
-qtci-linux-Ubuntu-18.04-x86_64           TARGET1     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET2     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET3     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET4     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET5     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET6     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET7     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET8     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET9     Yocto
-qtci-linux-Ubuntu-18.04-x86_64           TARGET10    Yocto
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.txt b/coin/platform_configs/qt3d-runtime.txt
deleted file mode 100644
index 7fe6794b..00000000
--- a/coin/platform_configs/qt3d-runtime.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features                   Configure arguments
---------------------------- ------------------- ----------- ----------- --------------- -------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-14   WinRT_10                        MSVC2015                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015
-qtci-windows-10-x86_64-14   WinRT_10            x86         MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++
-qtci-windows-10-x86_64-14                                   Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++
-qtci-windows-10-x86_64-14   WinRT_10            armv7       MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017
-qtci-windows-10-x86_64-14   WinRT_10                        MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017
-qtci-linux-RHEL-7.6-x86_64  Android_ANY         x86         GCC         Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86
-qtci-windows-10-x86_64-14   Android_ANY         armv7       Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a
-qtci-windows-10-x86_64-14   Android_ANY         x86         Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86
-qtci-windows-10-x86_64-14   Android_ANY         arm64       Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         DisableTests               -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc
-qtci-windows-10-x86_64-14   QNX_700             armv7       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc
-qtci-windows-10-x86_64-14   QNX_700             armv8       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc
-qtci-windows-10-x86_64-14   QNX_700             x86_64      Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc
-qtci-linux-RHEL-7.6-x86_64  QNX_700             armv8       GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc
-qtci-linux-RHEL-7.6-x86_64  QNX_700             x86_64      GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc
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.txt b/coin/platform_configs/qt5.txt
deleted file mode 100644
index 7fe6794b..00000000
--- a/coin/platform_configs/qt5.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features                   Configure arguments
---------------------------- ------------------- ----------- ----------- --------------- -------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-14   WinRT_10                        MSVC2015                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015
-qtci-windows-10-x86_64-14   WinRT_10            x86         MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++
-qtci-windows-10-x86_64-14                                   Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++
-qtci-windows-10-x86_64-14   WinRT_10            armv7       MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017
-qtci-windows-10-x86_64-14   WinRT_10                        MSVC2017                    Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017
-qtci-linux-RHEL-7.6-x86_64  Android_ANY         x86         GCC         Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86
-qtci-windows-10-x86_64-14   Android_ANY         armv7       Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a
-qtci-windows-10-x86_64-14   Android_ANY         x86         Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86
-qtci-windows-10-x86_64-14   Android_ANY         arm64       Mingw73     Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging DisableTests     -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         DisableTests               -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc
-qtci-windows-10-x86_64-14   QNX_700             armv7       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc
-qtci-windows-10-x86_64-14   QNX_700             armv8       Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc
-qtci-windows-10-x86_64-14   QNX_700             x86_64      Mingw73                     Packaging DisableTests     -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc
-qtci-linux-RHEL-7.6-x86_64  QNX_700             armv8       GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc
-qtci-linux-RHEL-7.6-x86_64  QNX_700             x86_64      GCC                         Packaging DisableTests     -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
new file mode 100644
index 00000000..b72ab7c2
--- /dev/null
+++ b/coin/platform_configs/qt5.yaml
@@ -0,0 +1,140 @@
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    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-14'
+    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 -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++'
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    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-14'
+    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-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-r19c -android-ndk-host linux-x86_64 -android-arch x86'
+-
+    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-r19c -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-r19c -android-arch arm64-v8a'
+-
+    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-r19c -android-arch x86'
+-
+    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-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
+-
+    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-r19c -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'
+    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-r19c -android-ndk-host darwin-x86_64 -android-arch x86'
+-
+    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'
+-
+    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'
+-
+    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'
+-
+    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'
+-
+    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'
+-
+    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'
+-
+    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.txt b/coin/platform_configs/qtbase.txt
deleted file mode 100644
index 7a4b85bf..00000000
--- a/coin/platform_configs/qtbase.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Template                          Target OS           Target arch Compiler    Features       Configure arguments
---------------------------------- ------------------- ----------- ----------- -------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC         DisableTests   -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC         DisableTests   -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
-qtci-windows-10-x86_64-14         WinRT_10            x86_64      MSVC2015                   -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -nomake examples -nomake tests -static -no-icu -release -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015
-qtci-linux-openSUSE-15.0-x86_64   WebAssembly                     GCC         DisableTests   -opensource -confirm-license -developer-build -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -nomake examples -nomake tests -prefix /home/qt/work/install -static -verbose -xplatform wasm-emscripten
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
new file mode 100644
index 00000000..374d9cb0
--- /dev/null
+++ b/coin/platform_configs/qtbase.yaml
@@ -0,0 +1,26 @@
+-
+    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/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+    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-windows-10-x86_64-14'
+    Target os: 'WinRT_10'
+    Target arch: 'x86_64'
+    Compiler: 'MSVC2015'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
+-
+    Template: 'qtci-linux-openSUSE-15.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/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt
deleted file mode 100644
index c5237cf8..00000000
--- a/coin/platform_configs/qtconnectivity.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Template                          Target OS           Target arch Compiler    Features       Configure arguments
---------------------------------- ------------------- ----------- ----------- -------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-14         WinRT_10            x86_64      MSVC2015                   -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -static -no-icu -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015
diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml
new file mode 100644
index 00000000..782d6bce
--- /dev/null
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -0,0 +1,6 @@
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    Target os: 'WinRT_10'
+    Target arch: 'x86_64'
+    Compiler: 'MSVC2015'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt
deleted file mode 100644
index a36c94a5..00000000
--- a/coin/platform_configs/qtdeclarative.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Template                          Target OS           Target arch Compiler    Features       Configure arguments
---------------------------------- ------------------- ----------- ----------- -------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC                        -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC                        -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/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml
new file mode 100644
index 00000000..9327b92e
--- /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/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
+-
+    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/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose'
+-
+    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.txt b/coin/platform_configs/qtsaferenderer.txt
deleted file mode 100644
index 3c000ec2..00000000
--- a/coin/platform_configs/qtsaferenderer.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Template                            Target OS           Target arch Compiler    Features      Configure arguments
------------------------------------ ------------------- ----------- ----------- ------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                                           Mingw73                   -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++ -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
new file mode 100644
index 00000000..cc0c29d7
--- /dev/null
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -0,0 +1,13 @@
+-
+    Template: 'qtci-windows-10-x86_64-14'
+    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-14'
+    Compiler: 'Mingw73'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker'
diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt
deleted file mode 100644
index ad320b09..00000000
--- a/coin/platform_configs/qtsdk.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Template                    Target OS           Target arch Compiler    Features        Configure arguments
---------------------------- ------------------- ----------- ----------- --------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86-3                                       MSVC2017                    -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-qtci-linux-RHEL-6.6-x86_64                                  GCC                         -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests
diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml
new file mode 100644
index 00000000..2c001058
--- /dev/null
+++ b/coin/platform_configs/qtsdk.yaml
@@ -0,0 +1,8 @@
+-
+    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'
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt
deleted file mode 100644
index ed004999..00000000
--- a/coin/platform_configs/qtwebkit.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Template                    Target OS           Target arch Compiler    Features                 Configure arguments
---------------------------- ------------------- ----------- ----------- ------------------------ --------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-14                       x86         MSVC2017    DisableTests             -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic
-qtci-windows-7-x86-3                                        Mingw73     Packaging DisableTests   -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -release -opengl dynamic
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.txt b/coin/platform_configs/tqtc-qt-rta.txt
deleted file mode 100644
index 82b086f9..00000000
--- a/coin/platform_configs/tqtc-qt-rta.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Template                    Target OS           Target arch Compiler    Features      Configure arguments
---------------------------- ------------------- ----------- ----------- ------------- --------------------------------------------------------------------------------------------------------------------------------------------------------
-qtci-windows-7-x86_64-4                                     MSVC2013    DisableTests  -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-qtci-windows-8.1-x86_64                                     MSVC2013    DisableTests  -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests
-qtci-windows-10-x86-3                                       MSVC2017                  -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-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'