Update submodules on '6.3.2 in qt/qt5'

Change-Id: Ia6ad5f49fd9d84c1f91b2cfac284e0f985fff7fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-26 01:46:20 +08:00 · 2022-09-07 12:40:51 +00:00 · 2022-09-01 01:05:15 +00:00 · 2022-08-30 20:26:38 +00:00 · 2022-08-30 04:16:31 +00:00 · 2022-08-24 04:15:25 +00:00
309 changed files with 1026 additions and 3791 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
+	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,203 +117,189 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.4.2
-	status = addon
+	branch = 6.3.2
+	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.4.2
+	branch = 6.3.2
 	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.4.2
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.4.2
-	status = preview
-
--- a/12
+++ b/12
@@ -20,10 +20,9 @@ ColumnLimit: 100
 # How much weight do extra characters after the line length limit have.
 # PenaltyExcessCharacter: 4

-# Disable reflow of some specific comments
-# qdoc comments: indentation rules are different.
-# Translation comments and SPDX license identifiers are also excluded.
-CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
+# Disable reflow of qdoc comments: indentation rules are different.
+# Translation comments are also excluded.
+CommentPragmas: "^!|^:"

 # We want a space between the type and the star for pointer types.
 PointerBindsToType: false
@@ -84,8 +83,3 @@ ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCH

 # Break constructor initializers before the colon and after the commas.
 BreakConstructorInitializers: BeforeColon
-
-# Avoids the addition of a space between an identifier and the
-# initializer list in list-initialization.
-SpaceBeforeCpp11BracedList: false
-
--- a/coin/conan/profiles/baseprofiles/android-arm64-clang
+++ b/coin/conan/profiles/baseprofiles/android-arm64-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=armv8
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/android-armv7-clang
+++ b/coin/conan/profiles/baseprofiles/android-armv7-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=armv7
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/android-x86-clang
+++ b/coin/conan/profiles/baseprofiles/android-x86-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=x86
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/android-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/android-x86_64-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=x86_64
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang
@@ -1,9 +0,0 @@
-[settings]
-    os=Emscripten
-    arch=wasm
-    compiler=clang
-    compiler.version=10
-    compiler.libcxx=libstdc++
-    build_type=Release
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/linux-x86_64-gcc
+++ b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc
@@ -1,9 +0,0 @@
-[settings]
-    os=Linux
-    arch=x86_64
-    compiler=gcc
-    compiler.version=9.3
-    compiler.libcxx=libstdc++11
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer
+++ b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer
@@ -1,9 +0,0 @@
-[settings]
-    os=Linux
-    arch=x86_64
-    compiler=gcc
-    compiler.version=9.3
-    compiler.libcxx=libstdc++11
-    build_type=Debug
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang
+++ b/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=iOS
-    os.version=13.0
-    arch=armv8
-    compiler=apple-clang
-    compiler.version=11.0
-    compiler.libcxx=libc++
-    build_type=Release
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/macos-universal-clang
+++ b/coin/conan/profiles/baseprofiles/macos-universal-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Macos
-    os.version=11.0
-    arch=x86_64
-    compiler=apple-clang
-    compiler.version=12.0
-    compiler.libcxx=libc++
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang
@@ -1,9 +0,0 @@
-[settings]
-    os=Emscripten
-    arch=wasm
-    compiler=clang
-    compiler.version=10
-    compiler.libcxx=libstdc++
-    build_type=Release
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64
+++ b/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64
@@ -1,11 +0,0 @@
-[settings]
-    os=Windows
-    arch=armv8
-    compiler=msvc
-    compiler.version=19.28
-    compiler.cppstd=17
-    compiler.runtime=dynamic
-    compiler.runtime_type=Release
-    build_type=Release
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang
@@ -1,9 +0,0 @@
-[settings]
-    os=Emscripten
-    arch=wasm
-    compiler=clang
-    compiler.version=10
-    compiler.libcxx=libstdc++
-    build_type=RelWithDebInfo
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/windows-x86_64-mingw
+++ b/coin/conan/profiles/baseprofiles/windows-x86_64-mingw
@@ -1,9 +0,0 @@
-[settings]
-    os=Windows
-    arch=x86_64
-    compiler=gcc
-    compiler.version=11
-    compiler.libcxx=libstdc++
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64
@@ -1,11 +0,0 @@
-[settings]
-    os=Windows
-    arch=x86_64
-    compiler=msvc
-    compiler.version=19.28
-    compiler.cppstd=17
-    compiler.runtime=dynamic
-    compiler.runtime_type=Release
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer
+++ b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer
@@ -1,11 +0,0 @@
-[settings]
-    os=Windows
-    arch=x86_64
-    compiler=msvc
-    compiler.version=19.28
-    compiler.cppstd=17
-    compiler.runtime=dynamic
-    compiler.runtime_type=Release
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer
+++ b/coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer
@@ -1,4 +1,4 @@
-include(./linux-x86_64-gcc-debug-developer)
+include(linux-developer-x86_64-gcc)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-linux-webassembly-x86_64-clang
+++ b/coin/conan/profiles/ci-linux-webassembly-x86_64-clang
@@ -1,4 +1,4 @@
-include(./linux-webassembly-x86_64-clang)
+include(linux-webassembly-x86_64-gcc)

 [options]
 qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-linux-x86_64-gcc
+++ b/coin/conan/profiles/ci-linux-x86_64-gcc
@@ -1,6 +1,6 @@
-include(./linux-x86_64-gcc)
+include(linux-x86_64-gcc)

 [options]
-qtbase:headersclean=True
+qtbase:headersclean=yes
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-macos-ios-arm64-clang
+++ b/coin/conan/profiles/ci-macos-ios-arm64-clang
@@ -1 +1 @@
-include(./macos-ios-arm64-clang)
+include(macos-ios-arm64-clang)
--- a/coin/conan/profiles/ci-macos-universal-clang
+++ b/coin/conan/profiles/ci-macos-universal-clang
@@ -1,6 +1,6 @@
-include(./macos-universal-clang)
+include(macos-universal-clang)

 [options]
-qtbase:headersclean=True
+qtbase:headersclean=yes
 qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT=$POSTGRESQLBINPATH/..'
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-macos-webassembly-x86_64-clang
+++ b/coin/conan/profiles/ci-macos-webassembly-x86_64-clang
@@ -1,5 +0,0 @@
-include(./macos-webassembly-x86_64-clang)
-
-[options]
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-arm64-clang
+++ b/coin/conan/profiles/ci-unix-android-arm64-clang
@@ -1,4 +1,4 @@
-include(./android-arm64-clang)
+include(unix-android-arm64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-armv7-clang
+++ b/coin/conan/profiles/ci-unix-android-armv7-clang
@@ -1,4 +1,4 @@
-include(./android-armv7-clang)
+include(unix-android-armv7-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-x86-clang
+++ b/coin/conan/profiles/ci-unix-android-x86-clang
@@ -1,4 +1,4 @@
-include(./android-x86-clang)
+include(unix-android-x86-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-x86_64-clang
+++ b/coin/conan/profiles/ci-unix-android-x86_64-clang
@@ -1,4 +1,4 @@
-include(./android-x86_64-clang)
+include(unix-android-x86_64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-arm64-clang
+++ b/coin/conan/profiles/ci-windows-android-arm64-clang
@@ -1,4 +1,4 @@
-include(./android-arm64-clang)
+include(windows-android-arm64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-armv7-clang
+++ b/coin/conan/profiles/ci-windows-android-armv7-clang
@@ -1,4 +1,4 @@
-include(./android-armv7-clang)
+include(windows-android-armv7-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-x86-clang
+++ b/coin/conan/profiles/ci-windows-android-x86-clang
@@ -1,4 +1,4 @@
-include(./android-x86-clang)
+include(windows-android-x86-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-x86_64-clang
+++ b/coin/conan/profiles/ci-windows-android-x86_64-clang
@@ -1,4 +1,4 @@
-include(./android-x86_64-clang)
+include(windows-android-x86_64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-arm64-msvc2019_64
+++ b/coin/conan/profiles/ci-windows-arm64-msvc2019_64
@@ -1,4 +1,4 @@
-include(./windows-arm64-msvc2019_64)
+include(windows-arm64-msvc2019_64)

 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON"
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-webassembly-x86_64-clang
+++ b/coin/conan/profiles/ci-windows-webassembly-x86_64-clang
@@ -1,5 +0,0 @@
-include(./windows-webassembly-x86_64-clang)
-
-[options]
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-x86_64-mingw
+++ b/coin/conan/profiles/ci-windows-x86_64-mingw
@@ -1,4 +1,4 @@
-include(./windows-x86_64-mingw)
+include(windows-x86_64-mingw)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.."
--- a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64
@@ -1,7 +1,7 @@
-include(./windows-x86_64-msvc2019_64)
+include(windows-x86_64-msvc2019_64)

 [options]
-qtbase:headersclean=True
+qtbase:headersclean=yes
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

--- a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer
+++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer
@@ -1,7 +0,0 @@
-include(./windows-x86_64-msvc2019_64-developer)
-
-[options]
-qtbase:headersclean=True
-qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-
--- a/coin/conan/profiles/linux-developer-x86_64-gcc
+++ b/coin/conan/profiles/linux-developer-x86_64-gcc
@@ -0,0 +1,17 @@
+[settings]
+    os=Linux
+    arch=x86_64
+    compiler=gcc
+    compiler.version=9.3
+    compiler.libcxx=libstdc++11
+    build_type=Release
+[options]
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:nomake=tests;examples
+qtbase:developer_build=yes
+qtbase:cmake_args_qtbase=""
+*:cmake_args_leaf_module=""
+[build_requires]
+[env]
+CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/linux-webassembly-x86_64-clang
+++ b/coin/conan/profiles/linux-webassembly-x86_64-clang
@@ -1,11 +0,0 @@
-include(baseprofiles/linux-webassembly-x86_64-clang)
-
-[options]
-qtbase:release=True
-qtbase:qt_host_path=$QT_HOST_PATH
-qtbase:nomake=examples;tests
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
-*:cmake_args_leaf_module=""
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/macos-webassembly-x86_64-clang
+++ b/coin/conan/profiles/macos-webassembly-x86_64-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/macos-webassembly-x86_64-clang)
-
+[settings]
+    os=Emscripten
+    arch=wasm
+    compiler=clang
+    compiler.version=10
+    compiler.libcxx=libstdc++
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=no
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:nomake=examples;tests
+qtbase:force_debug_info=yes
 qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
 *:cmake_args_leaf_module=""
 [build_requires]
--- a/coin/conan/profiles/linux-x86_64-gcc
+++ b/coin/conan/profiles/linux-x86_64-gcc
@@ -1,17 +1,22 @@
-include(baseprofiles/linux-x86_64-gcc)
-
+[settings]
+    os=Linux
+    arch=x86_64
+    compiler=gcc
+    compiler.version=9.3
+    compiler.libcxx=libstdc++11
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=yes
 qtbase:nomake=tests;examples
-qtbase:separate_debug_info=True
-qtbase:force_debug_info=True
-qtbase:bundled_xcb_xinput=True
-qtbase:libudev=False
+qtbase:separate_debug_info=yes
+qtbase:force_debug_info=yes
+qtbase:bundled_xcb_xinput=yes
+qtbase:libudev=no
 qtbase:doubleconversion=qt
 qtbase:pcre=qt
 qtbase:libjpeg=qt
 qtbase:libpng=qt
-qtbase:icu=True
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF"
 *:cmake_args_leaf_module=""
 [build_requires]
--- a/coin/conan/profiles/linux-x86_64-gcc-debug-developer
+++ b/coin/conan/profiles/linux-x86_64-gcc-debug-developer
@@ -1,11 +0,0 @@
-include(baseprofiles/linux-x86_64-gcc-debug-developer)
-
-[options]
-qtbase:debug=True
-qtbase:nomake=tests;examples
-qtbase:developer_build=True
-qtbase:cmake_args_qtbase=""
-*:cmake_args_leaf_module=""
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/macos-ios-arm64-clang
+++ b/coin/conan/profiles/macos-ios-arm64-clang
@@ -1,11 +1,17 @@
-include(baseprofiles/macos-ios-arm64-clang)
-
+[settings]
+    os=iOS
+    os.version=13.0
+    arch=armv8
+    compiler=apple-clang
+    compiler.version=11.0
+    compiler.libcxx=libc++
+    build_type=Release
 [options]
-qtbase:debug_and_release=True
+qtbase:shared=no
+qtbase:debug_and_release=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS"
-*:cmake_args_leaf_module=""
 [build_requires]
 [env]
 CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/macos-universal-clang
+++ b/coin/conan/profiles/macos-universal-clang
@@ -1,11 +1,18 @@
-include(baseprofiles/macos-universal-clang)
-
+[settings]
+    os=Macos
+    os.version=11.0
+    arch=x86_64
+    compiler=apple-clang
+    compiler.version=12.0
+    compiler.libcxx=libc++
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=yes
 qtbase:nomake=examples;tests
-qtbase:force_debug_info=True
-qtbase:separate_debug_info=True
-qtbase:framework=True
+qtbase:force_debug_info=yes
+qtbase:separate_debug_info=yes
+qtbase:framework=yes
 qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DODBC_ROOT=/usr/local/opt/libiodbc'
 *:cmake_args_leaf_module=""
 [build_requires]
--- a/coin/conan/profiles/unix-android-arm64-clang
+++ b/coin/conan/profiles/unix-android-arm64-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-arm64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv8
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/unix-android-armv7-clang
+++ b/coin/conan/profiles/unix-android-armv7-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-armv7-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv7
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/unix-android-x86-clang
+++ b/coin/conan/profiles/unix-android-x86-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-x86-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/unix-android-x86_64-clang
+++ b/coin/conan/profiles/unix-android-x86_64-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-x86_64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86_64
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-arm64-clang
+++ b/coin/conan/profiles/windows-android-arm64-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-arm64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv8
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-armv7-clang
+++ b/coin/conan/profiles/windows-android-armv7-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-armv7-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv7
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-x86-clang
+++ b/coin/conan/profiles/windows-android-x86-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-x86-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-x86_64-clang
+++ b/coin/conan/profiles/windows-android-x86_64-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-x86_64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86_64
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-arm64-msvc2019_64
+++ b/coin/conan/profiles/windows-arm64-msvc2019_64
@@ -1,7 +1,15 @@
-include(baseprofiles/windows-arm64-msvc2019_64)
-
+[settings]
+    os=Windows
+    arch=armv8
+    compiler=msvc
+    compiler.version=19.28
+    compiler.cppstd=17
+    compiler.runtime=dynamic
+    compiler.runtime_type=Release
+    build_type=Release
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=yes
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:nomake=tests
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DFEATURE_msvc_obj_debug_info=ON"
--- a/coin/conan/profiles/windows-webassembly-x86_64-clang
+++ b/coin/conan/profiles/windows-webassembly-x86_64-clang
@@ -1,12 +0,0 @@
-include(baseprofiles/windows-webassembly-x86_64-clang)
-
-[options]
-qtbase:release=True
-qtbase:qt_host_path=%QT_HOST_PATH%
-qtbase:nomake=examples;tests
-qtbase:force_debug_info=True
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
-*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF"
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/windows-x86_64-mingw
+++ b/coin/conan/profiles/windows-x86_64-mingw
@@ -1,9 +1,15 @@
-include(baseprofiles/windows-x86_64-mingw)
-
+[settings]
+    os=Windows
+    arch=x86_64
+    compiler=gcc
+    compiler.version=8.1
+    compiler.libcxx=libstdc++
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
-qtbase:separate_debug_info=True
+qtbase:shared=yes
+qtbase:debug_and_release=yes
+qtbase:force_debug_info=yes
+qtbase:separate_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:zlib=qt
 qtbase:libjpeg=qt
--- a/coin/conan/profiles/windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/windows-x86_64-msvc2019_64
@@ -1,9 +1,17 @@
-include(baseprofiles/windows-x86_64-msvc2019_64)
-
+[settings]
+    os=Windows
+    arch=x86_64
+    compiler=msvc
+    compiler.version=19.28
+    compiler.cppstd=17
+    compiler.runtime=dynamic
+    compiler.runtime_type=Release
+    build_type=RelWithDebInfo
 [options]
+qtbase:shared=yes
 qtbase:nomake=tests
-qtbase:debug_and_release=True
-qtbase:force_debug_info=True
+qtbase:debug_and_release=yes
+qtbase:force_debug_info=yes
 qtbase:zlib=None
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON"
 *:cmake_args_leaf_module=""
--- a/coin/conan/profiles/windows-x86_64-msvc2019_64-developer
+++ b/coin/conan/profiles/windows-x86_64-msvc2019_64-developer
@@ -1,14 +0,0 @@
-include(baseprofiles/windows-x86_64-msvc2019_64-developer)
-
-[options]
-qtbase:nomake=tests
-qtbase:debug_and_release=True
-qtbase:force_debug_info=True
-qtbase:developer_build=True
-qtbase:headersclean=True
-qtbase:make=examples
-qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_system_zlib=OFF"
-*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF"
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/instructions/coin_bic_tests.yaml
+++ b/coin/instructions/coin_bic_tests.yaml
@@ -1,32 +0,0 @@
-type: Group
-instructions:
-  - type: EnvironmentVariable
-    variableName: QT_MODULE_TO_TEST
-    variableValue: "qt=QtConcurrent,QtCore,QtDBus,QtDesigner,QtGui,QtHelp,QtNetwork,QtOpenGL,QtPrintSupport,QtQml,QtQuick,QtQuickTest,QtSql,QtSvg,QtTest,QtWidgets,QtXml;{{.SourceDir}}/qtbase"
-  - type: EnvironmentVariable
-    variableName: QTDIR
-    variableValue: "{{.InstallDir}}"
-  - type: PrependToEnvironmentVariable
-    variableName: PATH
-    variableValue: "{{.InstallDir}}/bin:"
-  - type: ChangeDirectory
-    directory: "{{.SourceDir}}/qtqa/tests/postbuild/bic"
-  - type: ExecuteCommand
-    command: ["{{.InstallDir}}/bin/qmake"]
-    maxTimeInSeconds: 3600
-    maxTimeBetweenOutput: 300
-    userMessageOnFailure: "Failed to execute qmake for bic tests"
-  - type: ExecuteCommand
-    command: ["make", "check", "-j1"]
-    maxTimeInSeconds: 7200
-    maxTimeBetweenOutput: 300
-    userMessageOnFailure: "Failed to execute bic tests"
-enable_if:
-  condition: and
-  conditions:
-    - condition: property
-      property: features
-      contains_value: Packaging
-    - condition: property
-      property: target.os
-      equals_value: Linux
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -9,4 +9,6 @@ instructions:
    - !include "{{qt/qt5}}/coin_qt_build_template.yaml"

  Test:
-    - !include "{{qt/qt5}}/coin_bic_tests.yaml"
+    - type: EnvironmentVariable
+      variableName: Dummy
+      variableValue: dummy
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -2,7 +2,9 @@ Version: 2
 Include: [
    cmake_platforms_qemu.yaml,
    cmake_platforms_qemu_qnx710.yaml,
-    cmake_platforms_target_android.yaml,
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml,
    cmake_platforms_wasm.yaml,
    macos.yaml
    ]
@@ -11,8 +13,7 @@ Configurations:
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
+    Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
    Id: 'Ubuntu-20.04-host'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -20,21 +21,20 @@ Configurations:
    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
    ]
 -
-    Id: 'OpenSUSE-15.4-host'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Id: 'OpenSUSE-15.3-host'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
+        'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
    ]
 -
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -49,9 +49,9 @@ Configurations:
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
+        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -65,29 +65,25 @@ Configurations:
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2022'
    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
    Id: 'Windows10_21H2-MSVC2019-x64-host'
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
    ]
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -98,47 +94,44 @@ Configurations:
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
+        'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64',
        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'
    ]
 -
    Id: 'Windows11_21H2-MSVC2019-x64-host'
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
    ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
    Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
+        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON'
    ]
 -
    Id: 'RHEL-8.4-host'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    Features: ['Packaging', 'Sccache', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'
+        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
    ]
 -
    Id: 'ios-universal'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
@@ -147,8 +140,8 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'
    ]
 -
    Id: 'Windows10_21H2-Mingw11-x64-host'
@@ -161,7 +154,7 @@ Configurations:
        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
+        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'
    ]
 -
    Id: 'Windows10_21H2-LLVM-x64-host'
@@ -172,40 +165,40 @@ Configurations:
    Environment variables: [
        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR=C:\llvm-mingw'
    ]
 -
    Id: 'Windows11_21H2-LLVM-x64-host'
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'Clang'
    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
    Environment variables: [
        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR=C:\llvm-mingw'
    ]
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
    ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
    ]
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -12,7 +12,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -28,7 +28,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -44,7 +44,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -8,12 +8,14 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'QCC'
    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'InsignificantTests', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+        'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
+        "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci'",
+        "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
+        "COIN_CTEST_RESULTSDIR=/home/qt/work"
    ]
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -25,7 +27,7 @@ Configurations:
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
    ]
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -37,5 +39,5 @@ Configurations:
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
    ]
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'sles-15-static'
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -19,7 +19,7 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Template: 'qtci-macos-11-x86_64-105'
+    Template: 'qtci-macos-11-x86_64-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -1,65 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-12-x86_64-105'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -0,0 +1,59 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
+        'ANDROID_EMULATOR=@emulator_x86_api_23'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
+    ]
--- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
@@ -0,0 +1,59 @@
+Version: 2
+Configurations:
+-
+    Id: 'android-arm64-on-macos'
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
+    ]
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -0,0 +1,62 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86 -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64 -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'
+    ]
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -1,26 +1,38 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'OpenSUSE-15.4-host'
+    Platform dependency: 'OpenSUSE-15.3-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'WebAssembly'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'WebAssembly'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang'
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
    ]
-
-    Id: 'webassembly-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'OpenSUSE-15.4-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -10,7 +10,7 @@ Configurations:
      Environment variables: [
          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
          'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
-          'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
+          'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF',
          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
          'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
          'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: "ios-tests-target"
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/coin/platform_configs/linux_android_tests_developer.yaml
@@ -7,10 +7,9 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
        'CONAN_INSTALL_DIR={{.InstallDir}}/target',
        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -9,26 +9,15 @@ Configurations:

    -
        Id: 'macos-latest-xcode-universal-packaging-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
-            'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
-        ]
-
-    -
-        Id: 'macos-latest-xcode-arm64-universal-build'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Target arch: 'x86_64-arm64'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
-        Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
+            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
+            'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
        ]

    # Test on all supported macOS versions (deployment targets)
@@ -47,7 +36,7 @@ Configurations:
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11-x86_64-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
@@ -63,30 +52,12 @@ Configurations:
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    -
-        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-12-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    -
-        Id: 'macos-12-arm64-arm64-universal-build-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
-    -
-        Id: 'macos-12-x86_64-arm64-universal-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'

    # =========================================================================
    # Developer build. Single architecture builds.
@@ -96,13 +67,12 @@ Configurations:

    -
        Id: 'macos-latest-xcode-x86_64-developer-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
        Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
        ]
    -
        Id: 'macos-latest-xcode-arm64-developer-build'
@@ -129,7 +99,7 @@ Configurations:
        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
    -
        Id: 'macos-11-x86_64-developer-build-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11-x86_64-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
@@ -141,7 +111,7 @@ Configurations:
        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
    -
        Id: 'macos-12-x86_64-developer-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
@@ -151,9 +121,3 @@ Configurations:
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-    -
-        Id: 'macos-13-arm64-developer-build-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
--- a/coin/platform_configs/nightly_qnx710_host_windows.yaml
+++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml
@@ -1,20 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        Windows10_21H2-MSVC2019-x64-host
-    ]
-]
-Configurations:
-
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'MSVC2019'
-    Target compiler: 'QCC'
-    Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
-    Features: ['DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
-    ]
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -9,7 +9,7 @@ Include: [
  macos.yaml: [
    "macos-12-x86_64-tests",
  ],
-  cmake_platforms_target_android.yaml: [
+  cmake_platforms_target_android_host_macos.yaml: [
    "android-arm64-on-macos"
  ],
  cmake_platforms_qemu.yaml: [
--- a/coin/platform_configs/qmake2cmake.yaml
+++ b/coin/platform_configs/qmake2cmake.yaml
@@ -1,15 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-
-    Template: 'qtci-macos-12-x86_64-105'
-    Compiler: 'Clang'
-    Features: ['DisableTests']
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['DisableTests']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -2,6 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml,
    integrity.yaml,
-    cmake_platforms_static_tests.yaml
+    cmake_platforms_static_tests.yaml,
+    linux_android_tests_developer.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qthttpserver.yaml
+++ b/coin/platform_configs/qthttpserver.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtquick3dphysics.yaml
+++ b/coin/platform_configs/qtquick3dphysics.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -4,21 +4,21 @@ Configurations:
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    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++'
+    Configure arguments: '-qmake -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++'
    Features: ['UseLegacyInstructions']
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    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++'
+    Configure arguments: '-qmake -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-8.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    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'
+    Configure arguments: '-qmake -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'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    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'
+    Configure arguments: '-qmake -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'
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -1,11 +1,15 @@
 Version: 2
-Include: [ cmake_platforms_target_android.yaml ]
+Include: [
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml
+    ]
 Configurations:
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
    Id: 'Windows10_21H2-Mingw11-x64-host'
    Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -20,7 +24,7 @@ Configurations:
    ]
 -
    Id: 'macos-latest-xcode-universal-packaging-build'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -49,8 +53,8 @@ Configurations:
    Platform dependency: 'RHEL-8.4-host'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
        'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
--- a/coin/platform_configs/tqtc-qtinsighttracker.yaml
+++ b/coin/platform_configs/tqtc-qtinsighttracker.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/tqtc-qtvncserver.yaml
+++ b/coin/platform_configs/tqtc-qtvncserver.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,64 +0,0 @@
-### SUSE Linux Enterprise Server 15 SP4 ###
-
-# Installation #
-Language: English (US)
-Keyboard Layout: English (US)
-
-Available Extensions and Modules:
-   Basesystem Module
-   Desktop Applications Module
-   Python 3 Module
-   Server Applications Module
-
-SLES with GNOME
-
-Region: Etc
-Time Zone: UTC
-
-Create user with automatic login
-
-disable firewall
-
-Displays: Resolution 1280x800
-Power: Screen Blank: Never
-Privacy: Screen lock: Automatic screen lock: disable
-Privacy: Screen lock: Show notifications on lock screen: disable
-
-# Add user to sudoers
-Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-
-sudo su -
-echo "add_drivers+=\"virtio-blk\"" >/etc/dracut.conf.d/virtio.conf
-dracut -f
-
-# Add these to /etc/polkit-default-privs.local
-org.freedesktop.udisks2.filesystem-mount yes
-org.freedesktop.udisks2.filesystem-mount-other-seat yes
-org.freedesktop.udisks2.filesystem-mount-system yes
-org.freedesktop.login1.power-off yes
-org.freedesktop.login1.power-off-ignore-inhibit yes
-org.freedesktop.login1.power-off-multiple-sessions yes
-
-# Set how DHClient creates CID for compatibility with older DHCP servers
-sudo sed -i 's/DHCLIENT_CREATE_CID=""/DHCLIENT_CREATE_CID="rfc2132"/' /etc/sysconfig/network/dhcp
-systemctl restart wicked
-
-# Create etc/sysconfig/network/ifcfg-eth1 with values:
-* BOOTPROTO='dhcp'
-* STARTMODE='auto'
-sudo ifup eth1
-
-# Register product
-# Add 'Available Extensions and Modules'
-* Basesystem Module 15 SP4 x86_64
-* Server Applications Module 15 SP4 x86_64
-
-zypper yum update
-
-* Download and run coin-setup
-
-# Fetch and run coin-setup
-Download http://coin/coin/binary/linux_386/coin-setup
-sudo ./coin-setup
-
-sudo reboot now
--- a/coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,42 +0,0 @@
-### OpenSUSE Leap 15.4 ###
-## KDE ##
-## In qtci-linux-openSUSE-15.4-x86_64-50 > Graphics Platform: X11 (System default) ##
-## In qtci-linux-openSUSE-15.4-x86_64-51 > Graphics Platform: Wayland (Plasma (Wayland))##
-
-# Installation #
-Language: English (US)
-Keyboard Layout: English (US)
-
-Activate online repositories during installation (yes)
-Use default selections
-
-Desktop with KDE Plasma
-
-Suggested Partitioning - default values
-
-Time Zone: UTC
-
-## Configurations ##
-Download and run coin-setup binary
-YaST - System - Services Manager - Firewalld - Stop
-# enable ssh access
-sudo rcsshd start
-Workspace Behavior - Screen locking - Lock screen automatically - unselect options
-Startup and Shutdown - Behavior - Login Screen - Select Automatically log in with session (System default)
-Add below to '$HOME/.config/autostart/coin-bootstrap-agent.desktop'
-    [Desktop Entry]
-    Type=Application
-    Exec=/usr/bin/gnome-terminal -e "/home/qt/bootstrap-agent /dev/ttyS0"
-    Hidden=false
-    X-GNOME-Autostart-enabled=true
-    Name=Coin
-Notifications
-    Critical notifications - unselect
-    Log priority notifications - unselect
-    Application progress: Show in task manager - unselect
-                          Show in notifications - unselect
-    Notification badges:  Show in task manager - unselect
-Display and Monitor - Display Configuration - 1280x800
-Power Management: Screen Energy Saving - unselect
-
-add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
--- a/coin/pre-provisioning/qtci-macos-12.0-x86_64/README
+++ b/coin/pre-provisioning/qtci-macos-12.0-x86_64/README
@@ -27,12 +27,3 @@
  - Copy its content to Tier1 folder
 * Copy Tier1 folder to 101 NFS
   - Check folder access rights
-
-# How to upgrade existing Tier1 image
-
-* Open KVM connection to Intel mac Parallels host
-   - Open Parallels :: create new VM :: select macOS :: start installation but then stop it when machine boots to recovery mode
-* You should now have a virtual machine folder in /Users/qt/Parallels/<VM folder>
-* Remove files from <VM folder>/harddisk.hdd/ and copy Tier1 VM files from NFS to <VM folder>/harddisk.hdd/
-* Start the virtual machine and make needed changes
-* Copy <VM folder>/harddisk.hdd to NFS with updated number in its name
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -55,20 +55,18 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"

-sudo mkdir -p $sdkTargetFolder
-
 basePath="http://ci-files01-hki.intra.qt.io/input/android"

 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersionLatest="r23b"
-ndkVersionDefault=$ndkVersionLatest
+ndkVersion="r22b"
+ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="31.0.0"
 sdkApiLevel="android-31"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1Latest="f47ec4c4badd11e9f593a8450180884a927c330d"
-ndkSha1Default=$ndkSha1Latest
+ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
+
 # Android automotive
 sdkApiLevelAutomovie="android-30"
 androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
@@ -77,37 +75,18 @@ android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
+ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"

-echo "Download and unzip Android SDK"
 DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
 echo "Unzipping Android Tools to '$sdkTargetFolder'"
 sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$ndkTargetFile"
 rm "$toolsTargetFile"

-function InstallNdk() {
-
-    ndkVersion=$1
-    ndkSha1=$2
-
-    if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
-
-        ndkFile="android-ndk-$ndkVersion-linux.zip"
-        ndkTargetFile="/tmp/$ndkFile"
-        ndkSourceFile="$basePath/$ndkFile"
-
-        DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
-        echo "Unzipping Android NDK to '$targetFolder'"
-        sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
-        rm "$ndkTargetFile"
-    fi
-
-}
-
-InstallNdk $ndkVersionDefault $ndkSha1Default
-SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
-InstallNdk $ndkVersionLatest $ndkSha1Latest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
-
 echo "Changing ownership of Android files."
 if uname -a |grep -q "el7"; then
    sudo chown -R qt:wheel "$targetFolder"
@@ -143,6 +122,7 @@ echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"

 SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"

--- a/coin/provisioning/common/linux/bootstrap-autostart.sh
+++ b/coin/provisioning/common/linux/bootstrap-autostart.sh
@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-# Make bootstap agent run in background without terminal view
-# Terminal view can cause issues with Autotests
-
-# Create shell wrapper to pass environment variables
-wrapper="${HOME}/bootstrap-agent.sh"
-autostart_folder="${HOME}/.config/autostart"
-# This directory should exist. Created in base image (tier 1)
-mkdir -p ${autostart_folder}
-
-# Create autostart desktop file and shell wrapper
-sudo tee ${autostart_folder}/coin-bootstrap-agent.desktop <<"EOF"
-[Desktop Entry]
-Type=Application
-Exec=/home/qt/bootstrap-agent.sh
-Hidden=false
-X-GNOME-Autostart-enabled=true
-Name=Coin
-EOF
-
-sudo tee $wrapper <<"EOF"
-#!/bin/sh
-# Wait for network to come up
-x=0
-while ! cat "/etc/resolv.conf" | grep -v "#" | grep "nameserver" > /dev/null ; do
-    echo "(WW) wating for network ($x/20)..." >> /home/qt/bootstrap-agent.txt
-    x=$((x+1))
-    sleep 1
-    if [ "$x" -gt 20 ]; then
-        echo "(EE) netowrk down. Exiting bootstrap." >> /home/qt/bootstrap-agent.txt
-        exit 1
-    fi
-done
-echo "(**) network found." >>  /home/qt/bootstrap-agent.txt
-
-# Wait for context to be mounted
-x=0
-while ! ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); do
-    echo "(WW) waiting for context file to be mounted ($x/20)..." >> /home/qt/bootstrap-agent.txt
-    x=$((x+1))
-    sleep 1
-    if [ "$x" -gt 20 ]; then
-        echo "(WW) no context file found. Mounting manually." >> /home/qt/bootstrap-agent.txt
-        break
-    fi
-done
-
-# establish mount path (differs per distro)
-if ! ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); then
-    MOUNTPATH="invalid"
-    if [ -d "/run/media/qt/CONTEXT" ]; then
-            MOUNTPATH="/run/media/qt/CONTEXT"
-    fi
-    if [ -d "/media/qt/CONTEXT" ]; then
-            MOUNTPATH="/media/qt/CONTEXT"
-    fi
-    if [ -d "/media/CONTEXT" ]; then
-            MOUNTPATH="/media/CONTEXT"
-    fi
-
-    # try mounting if unmounted
-    if [ -d "$MOUNTPATH" ]; then
-        if ! mount | grep "$MOUNTPATH" > /dev/null ; then
-            echo "(WW) context file not mounted..." >> /home/qt/bootstrap-agent.txt
-            echo "(WW) waiting 1 minute" >> /home/qt/bootstrap-agent.txt
-            sleep 60
-            echo "(**) mount /dev/sr0 $MOUNTPATH" >> /home/qt/bootstrap-agent.txt
-            sudo mount -r /dev/sr0 $MOUNTPATH
-        fi
-    fi
-fi
-
-if ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); then
-    echo "(**) context found." >>  /home/qt/bootstrap-agent.txt
-else
-    echo "(EE) context not found. Starting bootstrap anyway." >>  /home/qt/bootstrap-agent.txt
-fi
-
-/home/qt/bootstrap-agent /dev/ttyS0
-EOF
-
-# set owner and permissions
-sudo chown qt:users $wrapper
-sudo chmod 755 $wrapper
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -48,11 +48,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.24"
-version="3.24.2"
+majorminorversion="3.21"
+version="3.21.1"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
-SHA1="12627c808674ee5f5bd3a6982176613bbd3ad9db"
+SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-linux-x86_64"

--- a/coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake
+++ b/coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake
@@ -13,7 +13,7 @@ set(CMAKE_ASM_COMPILER cxintarm64)
 set(EGL_FOUND True)
 set(UNIX True)

-set (CMAKE_C_COMPILE_FEATURES c_std_11)
+set (CMAKE_C_COMPILE_FEATURES c_std_99)
 set (CMAKE_CXX_COMPILE_FEATURES
 cxx_alias_templates
 cxx_alignas
@@ -69,7 +69,7 @@ set(CMAKE_C_FLAGS  "-bsp $ENV{INTEGRITY_BSP} -os_dir $ENV{INTEGRITY_DIR} -non_sh

 set(CMAKE_C_FLAGS_DEBUG "-g -Omaxdebug")
 set(CMAKE_C_FLAGS_RELEASE "-Ospeed -Olink -Omax -no_uvfd")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 -std=c11 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")

 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -frigor=accurate --signed_fields --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor --commons -I $ENV{QC_MULTIMEDIA_INC_DIR}")
 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
--- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
+++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
--- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
+++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
--- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake
+++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake
--- a/coin/provisioning/common/linux/install-ffmpeg.sh
+++ b/coin/provisioning/common/linux/install-ffmpeg.sh
@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script will build and install FFmpeg static libs
-set -ex
-
-# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
-
-sudo apt install yasm
-
-version="n5.0"
-ffmpeg_name="FFmpeg-$version"
-
-url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
-url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="1a979876463fd81e481d53ceb3cc117f0fce8521"
-
-target_folder="$HOME"
-app_prefix=""
-
-InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_folder" "$app_prefix"
-
-mkdir -p "$target_folder/$ffmpeg_name/build"
-pushd "$target_folder/$ffmpeg_name/build"
-../configure $ffmpeg_config_options --prefix=installed
-make install -j
-popd
-
-SetEnvVar "FFMPEG_DIR" "$target_folder/$ffmpeg_name/build/installed"
--- a/coin/provisioning/common/linux/install-flite.sh
+++ b/coin/provisioning/common/linux/install-flite.sh
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs flite from sources.
-# Requires make, GCC and git to be in PATH.
-set -ex
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-repName="flite"
-gitUrl="https://github.com/festvox/$repName.git"
-tmpdir="/tmp"
-repDir="$tmpdir/$repName"
-prefix="/usr"
-rm -rf $repDir
-cd $tmpdir
-git clone $gitUrl >/dev/null
-cd $repDir
-git checkout v2.2 > /dev/null
-./configure --with-pic --enable-shared --prefix=$prefix > /dev/null
-make -j$(nproc) > /dev/null && sudo make install > /dev/null
-rm -rf $repDir
--- a/coin/provisioning/common/linux/install-git.sh
+++ b/coin/provisioning/common/linux/install-git.sh
@@ -42,17 +42,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="2.36.1"
+version="2.31.1"
 officialUrl="https://github.com/git/git/archive/refs/tags/v$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/git/git-$version.tar.gz"
 targetFile="/tmp/git-$version.tar.gz"
-sha="a17c11da2968f280a13832d97f48e9039edac354"
+sha="859dbeaefd9cb6c590050b9cc4b83cb51e412410"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 sourceDir="/tmp/git-$version-source"
 mkdir $sourceDir
 tar -xzf "$targetFile" -C $sourceDir

-cd "$sourceDir/git-$version"
+cd "$sourceDir/git-2.31.1"
 installDir="$HOME/git"
 make configure
 ./configure --prefix=$installDir
--- a/coin/provisioning/common/linux/integrity.sh
+++ b/coin/provisioning/common/linux/integrity.sh
@@ -48,9 +48,9 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_05102022.zip"
+urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_20042022.zip"
 urlLibeglmegapack="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_libeglmegapack.zip"
-SHA1_toolchainEs7="a95e11996d89218ac93493484e483d169976f565"
+SHA1_toolchainEs7="9e05277ec6a4610d4df565c3fbe24b9ce2a1f057"
 SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
 targetFolder="$HOME"
 appPrefix=""
--- a/coin/provisioning/common/linux/qnx_710.sh
+++ b/coin/provisioning/common/linux/qnx_710.sh
@@ -60,9 +60,9 @@ DownloadAndExtract () {
    rm -rf $file
 }

-aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
-armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
-x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
+aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
+armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
+x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
 QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"

 targetFolder="/opt/"
@@ -80,9 +80,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20211207-linux.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
+sha1="03f87bad1c5522d6aefcc74dd5ccacd43240ded3"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo cp $aarch64le_toolchain $targetPath
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt
@@ -25,7 +25,7 @@ function configure()
        cat >output/option_files/post_start.opt_nfs <<EOF

 echo "---> Starting NFS"
-STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
+STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
 EOF
    fi

--- a/coin/provisioning/common/macos/android.sh
+++ b/coin/provisioning/common/macos/android.sh
@@ -1,112 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
-
-set -ex
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-targetFolder="/opt/android"
-sdkTargetFolder="$targetFolder/sdk"
-
-basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
-
-toolsVersion="2.1"
-# toolsFile dertermines tools version
-toolsFile="commandlinetools-mac-6609375_latest.zip"
-
-ndkVersionLatest="r23b"
-ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="31.0.0"
-# this is compile sdk version
-sdkApiLevel="android-31"
-
-toolsSourceFile="$basePath/$toolsFile"
-
-function InstallNdk() {
-
-    ndkVersion=$1
-
-    if [[ ! -d "${targetFolder}/android-ndk-${ndkVersion}" ]]; then
-        echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
-        ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
-        sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
-    fi
-
-}
-
-InstallNdk $ndkVersionDefault
-InstallNdk $ndkVersionLatest
-
-echo "Unzipping Android Tools to '$sdkTargetFolder'"
-sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
-
-echo "Changing ownership of Android files."
-sudo chown -R qt:wheel "$targetFolder"
-
-# Run the following command under `eval` or `sh -c` so that the shell properly splits it
-sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
-
-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
-
-echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
-(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
-    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-    | eval $sdkmanager_no_progress_bar_cmd
-
-echo "Checking the contents of Android SDK..."
-ls -l "$sdkTargetFolder"
-
-SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
-SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
-SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
-SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
-
-echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
-echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
-echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
-echo "Android NDK = $ndkVersionDefault" >> ~/versions.txt
--- a/coin/provisioning/common/macos/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
@@ -48,11 +48,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.24.2"
-version="3.24.2"
+majorminorversion="3.21"
+version="3.21.1"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
-SHA1="19b1473e6ded2d234256b6aac90eb22616c5ab5e"
+SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
 appPrefix="cmake-$version-macos-universal"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -74,7 +74,7 @@ function InstallXCode() {
    echo "Versioning application bundle"
    majorVersion=$(echo $version | cut -d '.' -f 1)
    versionedAppBundle="/Applications/Xcode${majorVersion}.app"
-    sudo mv /Applications/Xcode*.app ${versionedAppBundle}
+    sudo mv /Applications/Xcode.app ${versionedAppBundle}

    echo "Selecting Xcode"
    sudo xcode-select --switch ${versionedAppBundle}
--- a/Show More
+++ b/Show More