Update submodules on '6.3.1 in qt/qt5'

Change-Id: I1596f30b5c472eb147fd227b89fcca0b3890464e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.4
+	branch = 6.3.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.4
+	branch = 6.3.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.4
+	branch = 6.3.1
 	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
+	branch = 6.3.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.4
+	branch = 6.3.1
 	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
+	branch = 6.3.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,203 +117,189 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.4
+	branch = 6.3.1
 	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
+	branch = 6.3.1
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.4
+	branch = 6.3.1
 	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
+	branch = 6.3.1
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.4
-	status = addon
+	branch = 6.3
+	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.4
+	branch = 6.3.1
 	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
+	branch = 6.3.1
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.4
+	branch = 6.3.1
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.4
+	branch = 6.3.1
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.4
+	branch = 6.3.1
 	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.4
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.4
-	status = preview
-

CMakeLists.txt

@@ -98,7 +98,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
 
     if(module STREQUAL "qtbase")
         if (NOT QT_BUILD_STANDALONE_TESTS)
-            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/${INSTALL_LIBDIR}/cmake")
+            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
             list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
         endif()
     endif()

_clang-format

@@ -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
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

coin/conan/profiles/ci-linux-developer-x86_64-gcc

@@ -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"

coin/conan/profiles/ci-linux-webassembly-x86_64-gcc

@@ -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"

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"

coin/conan/profiles/ci-macos-ios-arm64-clang

@@ -1 +1 @@
-include(./macos-ios-arm64-clang)
+include(macos-ios-arm64-clang)

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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%\.."

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"
 

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"
-

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

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

coin/conan/profiles/linux-webassembly-x86_64-gcc

@@ -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]

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]

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

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

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]

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

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

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

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

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

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

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

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

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"

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

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

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=""

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

coin/platform_configs/cmake_platforms.yaml

@@ -12,196 +12,160 @@ 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 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Features: ['Sccache', 'Documentation', 'TestDocs']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
 -
     Id: 'Ubuntu-20.04-host'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
-    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'
-    ]
+    Features: ['Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
 -
     Id: 'OpenSUSE-15.3-host'
     Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-nomake examples -developer-build'
+    Features: ['Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
     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_SP3-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -static -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    ]
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
     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-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     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_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    Features: ['Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
     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}}'
     ]
 -
     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'
+    Features: ['Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     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_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         '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']
-    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'
-    ]
+    Features: ['Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
     Platform dependency: 'Windows10_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 -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',
+        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        '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}}'
-    ]
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
 -
     Id: 'Windows11_21H2-MSVC2019-x64-host'
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
+    Features: ['Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
-    ]
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
     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_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Id: 'RHEL-8.4-host'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    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'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
     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-11-x86_64-104'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    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'
-    ]
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang']
 -
     Id: 'Windows10_21H2-Mingw11-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
     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}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
+        'NON_QTBASE_CONFIGURE_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'
     Template: 'qtci-windows-10_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',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw'
-    ]
+    Features: ['Sccache']
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR=C:\llvm-mingw']
 -
     Id: 'Windows11_21H2-LLVM-x64-host'
     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',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw'
-    ]
+    Features: ['Sccache']
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', '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',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
+    Features: ['Sccache']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
+    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
 -
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', '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',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
+    Features: ['Sccache']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
+    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -1,18 +1,16 @@
 Version: 2
 Configurations:
 -
-    Id: 'qemu-armv7-on-ubuntu20.04'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'UseConfigure']
+    Features: ['Sccache']
     Environment variables: [
-        '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',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.21.3/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',
@@ -23,12 +21,11 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'UseConfigure']
+    Features: ['Sccache']
     Environment variables: [
-        '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',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.21.3/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',
@@ -39,12 +36,11 @@ Configurations:
     Target arch: 'mips64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests']
     Environment variables: [
-        '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',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.21.3/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',

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -1,20 +1,20 @@
 Version: 2
 Configurations:
 -
-    Id: 'qnx-x86_64-on-ubuntu20.04'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'InsignificantTests', 'VMSize8']
     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',
-        'QT_CMAKE_DIR=/opt/cmake-3.21.3/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_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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",
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
@@ -22,11 +22,10 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'QCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'DisableTests']
     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',
-    ]
+        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
@@ -34,8 +33,7 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'QCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'DisableTests']
     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',
-    ]
+        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -1,25 +1,20 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15-static'
     Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -static -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    ]
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
     Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
 -
     Template: 'qtci-macos-11-x86_64-104'
     Compiler: 'Clang'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF'

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -7,12 +7,11 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -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'
@@ -21,10 +20,9 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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}}',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -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'
     ]
@@ -35,12 +33,11 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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_PROFILE=coin/conan/profiles/unix-android-x86-clang'
     ]
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
@@ -49,10 +46,9 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -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'
     ]

coin/platform_configs/cmake_platforms_target_android_host_macos.yaml

@@ -1,19 +1,17 @@
 Version: 2
 Configurations:
 -
-    Id: 'android-arm64-on-macos'
     Template: 'qtci-macos-10.14-x86_64'
     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']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -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-10.14-x86_64'
@@ -22,12 +20,11 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-armv7-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -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-10.14-x86_64'
@@ -36,12 +33,11 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
     ]
 -
     Template: 'qtci-macos-10.14-x86_64'
@@ -50,10 +46,9 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -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'
     ]

coin/platform_configs/cmake_platforms_target_android_host_windows.yaml

@@ -7,13 +7,12 @@ Configurations:
     Compiler: 'Mingw'
     Target compiler: 'Clang'
     Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-arm64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
+        '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'
@@ -22,13 +21,12 @@ Configurations:
     Compiler: 'Mingw'
     Target compiler: 'Clang'
     Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
+        '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'
@@ -37,13 +35,12 @@ Configurations:
     Compiler: 'Mingw'
     Target compiler: 'Clang'
     Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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}} -DFEATURE_pkg_config=OFF',
+        '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'
@@ -52,11 +49,10 @@ Configurations:
     Compiler: 'Mingw'
     Target compiler: 'Clang'
     Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86_64-clang'
-    ]
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang']
+

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -5,48 +5,33 @@ Configurations:
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Platform dependency: 'OpenSUSE-15.3-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
     ]
--
-    Id: 'webassembly-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'OpenSUSE-15.3-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']
 -
     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']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     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',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang']
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
 -
     Template: 'qtci-macos-10.14-x86_64'
     Target os: 'WebAssembly'
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-macos-webassembly-x86_64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
     ]

coin/platform_configs/integrity.yaml

@@ -1,20 +1,17 @@
 Version: 2
 Configurations:
     -
-      Id: "integrity-arm64-on-ubuntu20.04"
       Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
       Platform dependency: 'Ubuntu-20.04-host'
-      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
+      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16']
       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',
+          'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
           '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',
           'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
           'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
           'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
-      ]
+          'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']

coin/platform_configs/ios-tests.yaml

@@ -8,7 +8,5 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
-    ]
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

coin/platform_configs/linux_android_tests.yaml

@@ -7,12 +7,10 @@ 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 -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}}',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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',
-        'ANDROID_EMULATOR=@emulator_x86_api_23'
-    ]
+        'ANDROID_EMULATOR=@emulator_x86_api_23']

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}} -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}}',
+        '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',

coin/platform_configs/macos.yaml

@@ -12,22 +12,13 @@ Configurations:
         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'
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
+        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
         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',
-            'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
+            'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
+            'CONAN_PROFILE=coin/conan/profiles/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']
-        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON'
-
     # Test on all supported macOS versions (deployment targets)
 
     -
@@ -66,18 +57,6 @@ Configurations:
         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-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
 
     # =========================================================================
     # Developer build. Single architecture builds.
@@ -89,17 +68,14 @@ Configurations:
         Id: 'macos-latest-xcode-x86_64-developer-build'
         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}}'
-        ]
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors']
+        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
     -
         Id: 'macos-latest-xcode-arm64-developer-build'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
+        Features: ['DoNotRunTests', 'WarningsAreErrors']
+        Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON'
         # Note: We do not include OpenSSL or PostgreSQL in this build,
         # as the M1 CI machines are not provisioned for that yet.
 

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -1,14 +0,0 @@
-Version: 2
-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"',
-    ]

coin/platform_configs/precheck.yaml

@@ -1,22 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "Ubuntu-20.04-host",
-    "Windows10_21H2-MSVC2019-x64-host",
-    "ios-universal"
-  ],
-  macos.yaml: [
-    "macos-12-arm64-tests",
-  ],
-  cmake_platforms_target_android_host_macos.yaml: [
-    "android-arm64-on-macos"
-  ],
-  cmake_platforms_qemu.yaml: [
-    "qemu-armv7-on-ubuntu20.04"
-  ],
-  cmake_platforms_qemu_qnx710.yaml: [
-    "qnx-x86_64-on-ubuntu20.04"
-  ]
-]
-Configurations: []

coin/platform_configs/qmake2cmake.yaml

@@ -1,15 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
--
-    Template: 'qtci-macos-12-x86_64-102'
-    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']

coin/platform_configs/qt-creator.yaml

@@ -4,7 +4,7 @@ Configurations:
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
@@ -18,19 +18,19 @@ Configurations:
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
     Environment variables: []
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Qt5', 'Sccache', 'DebugAndRelease']
+    Features: ['Qt5', 'Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
     Environment variables: []
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
 -

coin/platform_configs/qthttpserver.yaml

@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []

coin/platform_configs/qtquick3dphysics.yaml

@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []

coin/platform_configs/tqtc-android-automotive.yaml

@@ -8,42 +8,36 @@ 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 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Features: ['Sccache', 'Documentation', 'TestDocs']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
 -
     Id: 'Windows10_21H2-Mingw11-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
     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}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
 -
     Id: 'macos-latest-xcode-universal-packaging-build'
     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'
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
+    Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
     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',
-        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
-    ]
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
+        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang']
 -
     Id: 'RHEL-8.4-host'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', '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'
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
     Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
-    ]
+        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc']
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
@@ -51,11 +45,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 -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}}',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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_PROFILE=coin/conan/profiles/unix-android-x86-clang',
-        'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
-    ]
+        'ANDROID_EMULATOR=@automotive_emulator_x86_api_30']

coin/platform_configs/tqtc-qtvncserver.yaml

@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []

coin/provisioning/common/linux/android_linux.sh

@@ -59,13 +59,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersion="r23b"
-ndkFile="android-ndk-$ndkVersion-linux.zip"
+ndkVersion="r22b"
+ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="31.0.0"
 sdkApiLevel="android-31"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1="f47ec4c4badd11e9f593a8450180884a927c330d"
+ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
 
 # Android automotive
 sdkApiLevelAutomovie="android-30"

coin/provisioning/common/linux/cmake_linux.sh

@@ -49,10 +49,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 majorminorversion="3.21"
-version="3.21.3"
+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="5461d4f066a728445e0b6be0e4d250b828323908"
+SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-linux-x86_64"
 

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})

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

coin/provisioning/common/macos/cmake.sh

@@ -49,10 +49,10 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 majorminorversion="3.21"
-version="3.21.3"
+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="6775e6eebae22b5ab3010609132c093e65cc4587"
+SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
 appPrefix="cmake-$version-macos-universal"
 
 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

coin/provisioning/common/unix/emsdk.sh

@@ -41,8 +41,8 @@
 # shellcheck source=./SetEnvVar.sh
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 
-version="3.1.10"
-versionNode="v14.18.2"
+version="3.0.0"
+versionNode="v14.15.5"
 
 mkdir -p /opt
 cd /opt

coin/provisioning/common/unix/openssl_for_android.sh

@@ -82,11 +82,11 @@ PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 '
 
 if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-darwin.tar.gz"
-    sha="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz"
+    sha="d8c189f8a329263365c73bc471b6c9c68d117e3a"
 else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-linux.tar.gz"
-    sha="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz"
+    sha="db028f25ca4d000fe2317c3abfdfa0c234833549"
 fi
 targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
 DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"

coin/provisioning/common/unix/squishInstall.sh

@@ -47,20 +47,19 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.7.2"
+version="6.7.1"
 qtBranch="62x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
 preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-licenseFile=".squish-license"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$licenseFile"
-licenseSHA="bda9c3bce2b9a74cb10ead9e87a4ebacd9eef4c2"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
+licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-    compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz"
-    sha1="6b7d80be4d107ba53ac9218fe5ca79f72c6e1e2d"
+    compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz"
+    sha1="1526d4d57f8025f83aad836a43e8fa0317dbddc2"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="1f57efd6f21a994b07f28b0b44ff7972bbf51733"
+     sha1="d412c3389d95a65341b51d2e14cba47ce3b54a86"
 fi
 
 mountFolder="/tmp/squish"
@@ -102,7 +101,7 @@ sudo tar -xzf "$targetFileMount" --directory "$installFolder"
 echo "Unmounting $mountFolder"
 sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
 
-sudo mv "$installFolder/rta_squish_$qtBranch" "$squishFolder"
+sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
 if uname -a |grep -q Darwin; then
     sudo xattr -r -c "$squishFolder"
 fi
@@ -115,12 +114,11 @@ if uname -a |grep -q "Ubuntu"; then
     fi
 fi
 
-
-DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile"
+DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license"
 
 echo "Changing ownerships"
 sudo chown -R qt:$usersGroup "$squishFolder"
-sudo chown qt:$usersGroup "$HOME/$licenseFile"
+sudo chown qt:$usersGroup "$HOME/.squish-3-license"
 
 echo "Set commands for environment variables in .bashrc"
 if uname -a |grep -q "Ubuntu"; then

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

@@ -52,13 +52,13 @@ if (Is64BitWinHost) {
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
 $version = "1.1.1m"
-$ndk_version = "r23b"
-$zip = Get-DownloadLocation ("openssl-${version}_fixes-ndk_root.tar.gz")
-$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-used-ndk-${ndk_version}-windows.zip")
+$ndk_version = "r22b"
+$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
+$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
 $sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
-$prebuilt_sha1 = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
+$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
 $destination = "C:\Utils\openssl-android-master"
-$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-used-ndk-${ndk_version}-windows.zip"
+$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
 
 # msys unix style paths
 $ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"

coin/provisioning/common/windows/android.ps1

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2022 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -46,10 +46,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkVersion = "r23b"
-$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows.zip"
-$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows.zip"
-$ndkChecksum = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
+$ndkVersion = "r22b"
+$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
+$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
+$ndkChecksum = "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 

coin/provisioning/common/windows/cmake.ps1

@@ -40,7 +40,7 @@
 . "$PSScriptRoot\helpers.ps1"
 
 $majorminorversion = "3.21"
-$version = "3.21.3"
+$version = "3.21.1"
 
 $zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip"
@@ -50,7 +50,7 @@ Write-Host "Removing old cmake"
 Remove "C:\CMake"
 
 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "f853ad791629141ce4121b175a2afdb4e46e7a54"
+Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5"
 
 Extract-7Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"

coin/provisioning/common/windows/emsdk.ps1

@@ -41,7 +41,7 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "3.1.10"
+$version = "3.0.0"
 
 # Make sure python is in the path
 Prepend-Path "C:\Python27"

coin/provisioning/common/windows/helpers.ps1

@@ -148,7 +148,7 @@ function Download
         if ($CachedUrl.StartsWith("http")) {
             Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
         } else {
-            Copy-Item $CachedUrl $Destination -errorAction stop
+            Copy-Item $CachedUrl $Destination
         }
     } catch {
         Write-Host "Cached download failed: Downloading from official location: $OfficialUrl"

coin/provisioning/common/windows/squishInstall.ps1

@@ -42,15 +42,15 @@
 # This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
 
-$version = "6.7.2"
-$qtBranch = "62x"
+$version = "6.7-20210614-1625"
+$qtBranch = "61x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
-$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\"
+$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x"
 
 # Squish license
-$licensePackage = ".squish-license"
+$licensePackage = ".squish-3-license"
 
 Write-Host "Installing Squish license to home directory"
 Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
@@ -67,7 +67,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro
     # In Windows 11 case $OSVersion is 'Windows 10 Pro'
     $winVersion = "win10"
     if (Is64BitWinHost) {
-        $sha1 = "3dd65fe3996bffd25892d5a7dfd2da26420a3f33"
+        $sha1 = "0ce4f94ebff488fedef29e9ed62b400a8b5014fb"
     }
 } else {
     $winVersion = "n/a"
@@ -78,7 +78,6 @@ Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
 Verify-Checksum "C:\Utils\$squishArchive" $sha1
 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
 Rename-Item "$squishPackage" "$targetDir"
-Remove-Item "C:\Utils\prebuild*"
 
 Write-Host "Verifying Squish Installation for following targets:"
 get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName }

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

@@ -112,8 +112,6 @@ installPackages+=(perl-Digest-SHA)
 installPackages+=(glibc.i686)
 # Enable Qt Bluetooth
 installPackages+=(bluez-libs-devel)
-# QtNfc
-installPackages+=(pcsc-lite-devel)
 # QtWebKit
 installPackages+=(libxml2-devel)
 installPackages+=(libxslt-devel)

coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2022 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersion="r23b"
-ndkFile="android-ndk-$ndkVersion-darwin.zip"
+ndkVersion="r22b"
+ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
 sdkBuildToolsVersion="31.0.0"
 # this is compile sdk version
 sdkApiLevel="android-31"

coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2022 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersion="r23b"
-ndkFile="android-ndk-$ndkVersion-darwin.zip"
+ndkVersion="r22b"
+ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
 sdkBuildToolsVersion="31.0.0"
 # this is compile sdk version
 sdkApiLevel="android-31"

coin/provisioning/qtci-macos-11-x86_64/30-android.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2022 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersion="r23b"
-ndkFile="android-ndk-$ndkVersion-darwin.zip"
+ndkVersion="r22b"
+ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
 sdkBuildToolsVersion="31.0.0"
 # this is compile sdk version
 sdkApiLevel="android-31"

coin/provisioning/qtci-macos-11.0-arm/25-python3.sh

@@ -53,8 +53,6 @@ pyenv install 3.9.7
 
 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 
 # Install all needed packages in a special wheel cache directory
 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt