Update submodules on '6.11.0 in qt/qt5'

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

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.11.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.11.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.11.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.11.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.11.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.11.0
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.11.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,107 +252,107 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.11.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.11.0
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.11.0
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.11.0
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
+	branch = 6.11.0
 	status = preview

cmake/QtIRGitHelpers.cmake

@@ -102,27 +102,18 @@ endfunction()
 # - ../qt/qttools-litehtml.git
 function(qt_ir_add_git_remotes repo_relative_url working_directory)
     set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
-    set(gerrit_https_base "https://@USER@codereview.qt-project.org@AUTH@/")
+    set(gerrit_repo_url "${gerrit_ssh_base}")
 
     qt_ir_get_option_value(codereview-username username)
-    qt_ir_get_option_value(codereview-https https)
-
-    if(https)
-        set(gerrit_repo_url "${gerrit_https_base}")
-    else()
-        set(gerrit_repo_url "${gerrit_ssh_base}")
-    endif()
 
     # If given a username, make a "verbose" remote.
     # Otherwise, rely on proper SSH configuration.
     if(username)
         string(REPLACE "@USER@" "${username}@" gerrit_repo_url "${gerrit_repo_url}")
         string(REPLACE "@PORT@" ":29418" gerrit_repo_url "${gerrit_repo_url}")
-        string(REPLACE "@AUTH@" "/a" gerrit_repo_url "${gerrit_repo_url}")
     else()
         string(REPLACE "@USER@" "" gerrit_repo_url "${gerrit_repo_url}")
         string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
-        string(REPLACE "@AUTH@" ""   gerrit_repo_url "${gerrit_repo_url}")
     endif()
 
     set(namespace "qt")

cmake/QtIRHelp.txt

@@ -98,9 +98,6 @@ Options:
         username and port number, and thus relies on a correct SSH
         configuration.
 
-    --codereview-https
-        Specify this option to use HTTPs instead of SSH.
-
     --alternates <path to other Qt5 repo>
         Adds alternates for each submodule to another full qt5 checkout.
         This makes this qt5 checkout very small, as it will use the object

cmake/QtIRHelpers.cmake

@@ -130,11 +130,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
     set(extra_configure_args "")
     set(extra_cmake_args "")
 
-    # Collect modules to skip. These may come from:
-    # 1. The -skip option (consumed by init-repository's option parser)
-    # 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
-    qt_ir_get_option_value(skip skip_modules)
-
     # If the -submodules or --module-subset options were specified, transform
     # the values into something configure understands and pass them to configure.
     qt_ir_get_option_value(module-subset submodules)
@@ -158,10 +153,25 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         endif()
 
         list(JOIN include_submodules "," include_submodules)
+        list(JOIN exclude_submodules "," exclude_submodules)
 
-        # Merge exclusions from module-subset into the skip list.
-        if(exclude_submodules)
-            list(APPEND skip_modules ${exclude_submodules})
+        # Handle case when the -skip argument is already passed.
+        # In that case read the passed values, merge with new ones,
+        # remove both the -skip and its values, and re-add it later.
+        list(FIND filtered_args "-skip" skip_index)
+        if(exclude_submodules AND skip_index GREATER -1)
+            list(LENGTH filtered_args filtered_args_length)
+            math(EXPR skip_args_index "${skip_index} + 1")
+
+            if(skip_args_index LESS filtered_args_length)
+                list(GET filtered_args "${skip_args_index}" skip_args)
+                string(REPLACE "," ";" skip_args "${skip_args}")
+                list(APPEND skip_args ${exclude_submodules})
+                list(REMOVE_DUPLICATES skip_args)
+                list(JOIN skip_args "," exclude_submodules)
+                list(REMOVE_AT filtered_args "${skip_args_index}")
+                list(REMOVE_AT filtered_args "${skip_index}")
+            endif()
         endif()
 
         # Handle case when only '-submodules existing' is passed and the
@@ -169,13 +179,9 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         if(include_submodules)
             list(APPEND extra_configure_args "-submodules" "${include_submodules}")
         endif()
-    endif()
-
-    # Forward all collected skip modules to configure.
-    if(skip_modules)
-        list(REMOVE_DUPLICATES skip_modules)
-        list(JOIN skip_modules "," skip_csv)
-        list(APPEND extra_configure_args "-skip" "${skip_csv}")
+        if(exclude_submodules)
+            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
+        endif()
     endif()
 
     # Insert the extra arguments into the proper positions before and after '--'.

cmake/QtIROptionsHelpers.cmake

@@ -14,7 +14,6 @@ macro(qt_ir_set_known_command_line_options)
     qt_ir_commandline_option(berlin TYPE boolean)
     qt_ir_commandline_option(branch TYPE boolean)
     qt_ir_commandline_option(codereview-username TYPE string)
-    qt_ir_commandline_option(codereview-https TYPE boolean)
     qt_ir_commandline_option(copy-objects TYPE boolean)
     qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
     qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)

coin/platform_configs/macos.yaml

@@ -17,14 +17,18 @@ Configurations:
         Environment variables: [
             'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
         ]
 
     # Test on all supported macOS versions (deployment targets)
 
     # On x86_64
 
+    -
+        Id: 'macos-13-x86_64-tests'
+        Template: 'qtci-macos-13-x86_64-103'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-x86_64-tests'
         Template: 'qtci-macos-14-x86_64-105'
@@ -37,16 +41,15 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-26-x86_64-tests'
-        Template: 'qtci-macos-26-x86_64-101'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
-        Platform dependency: 'macos-universal-on-arm64'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
 
     # And arm64
 
+    -
+        Id: 'macos-13-arm64-tests'
+        Template: 'qtci-macos-13-arm-107'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
@@ -78,18 +81,6 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
         Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
-        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
-        ]
-    -
-        Id: 'macos-26-x86_64-developer-build'
-        Template: 'qtci-macos-26-x86_64-101'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
@@ -103,8 +94,6 @@ Configurations:
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
         ]
     -
         Id: 'macos-26-arm64-developer-build'
@@ -115,11 +104,15 @@ Configurations:
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=arm64-osx-qt',
-            'VCPKG_TARGET_TRIPLET=arm64-osx-qt',
         ]
 
     # Test on all supported macOS versions (deployment targets)
+    -
+        Id: 'macos-13-arm64-developer-build-tests'
+        Template: 'qtci-macos-13-arm-107'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
+        Platform dependency: 'macos-arm64-developer-build'
     -
         Id: 'macos-14-arm64-developer-build-tests'
         Template: 'qtci-macos-14-arm-106'
@@ -136,6 +129,6 @@ Configurations:
         Id: 'macos-26-arm64-developer-build-tests'
         Template: 'qtci-macos-26-arm-104'
         Compiler: 'Clang'
-        Features: ['TestOnly']
+        Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
         Platform dependency: 'macos-26-arm64-developer-build'
         Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]

coin/platform_configs/messagingframework.yaml

@@ -1,8 +0,0 @@
-Version: 2
-Module only: true
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-22.04"
-  ]
-]
-Configurations: []

coin/platform_configs/nightly_build_qt_with_cmake_master.yaml

@@ -1,11 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
-]
-Configurations: []
-Overrides:
--
-    Id: '.*'
-    +Features: ['BuildCMakeFromSources']

coin/platform_configs/nightly_ubuntu_22_04_baseline_tests.yaml

@@ -1,16 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
--
-    Id: 'ubuntu-22.04-baseline-tests'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-developer-build -nomake examples'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_test_auto=OFF -DFEATURE_test_baseline=ON -DOpenGL_GL_PREFERENCE=LEGACY',
-        'CTEST_DIR=tests/baseline',
-        'TESTARGS=-auto',
-        'QT_LANCELOT_SERVER=10.150.153.60'
-    ]
-

coin/platform_configs/nightly_unity_builds.yaml

@@ -5,7 +5,7 @@ Configurations:
     Template: 'qtci-windows-11_24H2-x86_64-71'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-debug -force-debug-info -headersclean -nomake examples -qt-zlib' # disabled example builds: qmake builds fail with C1041
+    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',

coin/platform_configs/qtbridge-csharp.yaml

@@ -1,13 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "windows-quick-bridges"
-  ]
-]
-Configurations:
--
-    Id: 'windows-quick-bridges-csharp'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesCsharp']

coin/platform_configs/qtbridge-java.yaml

@@ -1,46 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "linux-quick-bridges",
-     "windows-quick-bridges"
-     ]
-]
-
-Configurations:
--
-    Id: 'windows-quick-bridges-java'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
-
--
-    Id: 'windows-on-arm-quick-bridges-java'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
-
--
-    Id: 'linux-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
-
--
-    Id: 'linux-on-arm-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-    ]
--
-    Id: 'macos-quick-bridges-universal-java'
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
-    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-    ]

coin/platform_configs/qtbridge-python.yaml

@@ -1,37 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "windows-quick-bridges"
-  ],
-  cmake_platforms.yaml: [
-     "rhel-9.6"
-  ]
-]
-Configurations:
--
-    Id: 'windows-quick-bridges-python'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
--
-    Id: 'linux-quick-bridges-python'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
--
-    Id: 'macos-quick-bridges-python'
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
--
-    Id: 'windows-on-arm-quick-bridges-python'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesPython']

coin/platform_configs/qtbridge-rust.yaml

@@ -1,21 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "linux-quick-bridges",
-     "windows-quick-bridges"
-  ]
-]
-Configurations:
--
-    Id: 'windows-quick-bridges-rust'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
-
--
-    Id: 'linux-quick-bridges-rust'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']

coin/platform_configs/qtbridge-swift.yaml

@@ -1,21 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "linux-quick-bridges"
-  ]
-]
-Configurations:
--
-    Id: 'macos-quick-bridges-swift'
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
-
--
-    Id: 'linux-quick-bridges-swift'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']

coin/platform_configs/qtgradleplugin.yaml

@@ -5,7 +5,7 @@ Configurations:
     Id: 'qtgp-on-linux-rhel_9_6'
     Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure']
+    Features: ['TestOnly']
 -
     Id: 'qtgp-on-macos'
     Template: 'qtci-macos-14-arm-106'

coin/platform_configs/quick-bridges.yaml

@@ -43,9 +43,7 @@ Configurations:
         -no-feature-vnc
         -no-feature-picture
         -no-feature-pdf
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-    ]
+    Environment variables: []
 -
     Id: 'windows-quick-bridges'
     Template: 'qtci-windows-11_24H2-x86_64-71'

coin/platform_configs/tqtc-qtbridges.yaml

@@ -10,6 +10,13 @@ Include: [
   ]
 ]
 Configurations:
+-
+    Id: 'windows-quick-bridges-dotnet'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']
+
 -
     Id: 'windows-quick-bridges-rust'
     Template: 'qtci-windows-11_24H2-x86_64-71'
@@ -40,14 +47,14 @@ Configurations:
 
 -
     Id: 'linux-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
     Compiler: 'GCC'
     Platform dependency: 'linux-quick-bridges'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
 
 -
     Id: 'linux-quick-bridges-rust'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
     Compiler: 'GCC'
     Platform dependency: 'linux-quick-bridges'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']

coin/platform_configs/tqtc-qtmcp.yaml

@@ -1,15 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'ubuntu-22.04',
-        'ubuntu-22.04-x11-tests',
-        'ubuntu-24.04-x64',
-        'ubuntu-24.04-x64-x11-tests',
-        'windows-11_24H2-msvc2022'
-    ],
-    macos.yaml: [
-        'macos-arm64-developer-build',
-        'macos-14-arm64-developer-build-tests'
-    ]
-]
-Configurations: []

coin/provisioning/common/linux/android_linux.sh

@@ -241,7 +241,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
 cd /tmp/gradle_project
 # Get Gradle files from qtbase
 qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle"
-commit_sha="b775c756f019d067c491bad7816f3a0cc8ea8b31"
+commit_sha="269a75dbd1262a714eb238c42e5159a0a8979818"
 curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties
 curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew
 curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat

coin/provisioning/common/linux/axivion/rule_config.json

@@ -51,13 +51,13 @@
             "_active": true
         },
         "Qt-CtorMissingParentArgument": {
-            "_active": false
+            "_active": true
         },
         "Qt-DetachingTemporary": {
             "_active": true
         },
         "Qt-FullyQualifiedMocTypes": {
-            "_active": false
+            "_active": true
         },
         "Qt-FunctionArgsByValueRef": {
             "_active": false
@@ -69,13 +69,13 @@
             "_active": true
         },
         "Qt-Generic-InitializeAllFieldsInConstructor": {
-            "_active": false
+            "_active": true
         },
         "Qt-Generic-MissingBaseCopy": {
-            "_active": false
+            "_active": true
         },
         "Qt-Generic-MissingIncludeGuard": {
-            "_active": false
+            "_active": true
         },
         "Qt-Generic-MissingTrCall": {
             "_active": true
@@ -84,7 +84,7 @@
             "_active": true
         },
         "Qt-Generic-NoFunctionDefinitionInHeader": {
-            "_active": false
+            "_active": true
         },
         "Qt-Generic-NoIrregularInclude": {
             "_active": true
@@ -114,7 +114,7 @@
             "_active": true
         },
         "Qt-IncorrectEmit": {
-            "_active": false
+            "_active": true
         },
         "Qt-InstallEventFilter": {
             "_active": true
@@ -129,16 +129,16 @@
             "_active": true
         },
         "Qt-MissingQObjectMacro": {
-            "_active": false
+            "_active": true
         },
         "Qt-MutableContainerKey": {
             "_active": true
         },
         "Qt-NonPodGlobalStatic": {
-            "_active": false
+            "_active": true
         },
         "Qt-OldStyleConnect": {
-            "_active": false
+            "_active": true
         },
         "Qt-OverloadedSignal": {
             "_active": true
@@ -162,7 +162,7 @@
             "_active": true
         },
         "Qt-QPropertyWithoutNotify": {
-            "_active": false
+            "_active": true
         },
         "Qt-QStringArg": {
             "_active": true
@@ -186,7 +186,7 @@
             "_active": true
         },
         "Qt-RuleOfThree": {
-            "_active": false
+            "_active": true
         },
         "Qt-RuleOfTwoSoft": {
             "_active": true

coin/provisioning/common/linux/install-vcpkg-ports-android.sh

@@ -4,7 +4,9 @@
 
 echo "Installing vcpkg android ports"
 
-pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
+pushd "${BASH_SOURCE%/*}/vcpkg" || exit
+cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
+
 "$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
 "$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug
 

coin/provisioning/common/linux/install-vcpkg-ports.sh

@@ -7,12 +7,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 echo "Installing vcpkg ports"
 
-pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
+pushd "${BASH_SOURCE%/*}/vcpkg" || exit
+cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
 
-install_root=$1-tmp
-vcpkg_extra_args=$2
+install_root=x64-linux-qt-tmp
 
-"$VCPKG_ROOT/vcpkg" install --triplet $1 --x-install-root $install_root --debug $vcpkg_extra_args
+"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug
 
 cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
     "-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\

coin/provisioning/common/linux/install-vcpkg.sh

@@ -34,7 +34,7 @@ do
         "vcpkg_tool_release_tag")
             vcpkgToolReleaseTag=${keyValue[1]}
             ;;
-        "unix_checksum")
+        "linux_checksum")
             vcpkgToolChecksum=${keyValue[1]}
             ;;
     esac
@@ -86,7 +86,7 @@ SetEnvVar "VCPKG_ROOT" "$vcpkgRoot"
 export VCPKG_ROOT="$vcpkgRoot"
 
 # Set a source for vcpkg Binary and Asset Cache
-# The `coin/provisioning/common/<platform>/mount-vcpkg-cache-drive.sh` script is
+# The `coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh` script is
 # mounting the SMB share located in `vcpkg-server.ci.qt.io/vcpkg` to
 # $HOME/vcpkg-cache/
 export VCPKG_BINARY_SOURCES="files,$HOME/vcpkg-cache/binaries,readwrite"

coin/provisioning/common/linux/install-vxworks-qemu.sh

@@ -13,7 +13,7 @@ QEMU_VER="8.2.3"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qemu/qemu-$QEMU_VER.tar.xz"
 AltUrl="https://download.qemu.org/qemu-$QEMU_VER.tar.xz"
 SHA1="1b29c8105cf8d15b9e7fb6f8e85170b6c54a1788"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" "$appPrefix"
 
 targetFolder=/tmp/qemu-${QEMU_VER}
 mkdir -p "$targetFolder/build"

coin/provisioning/common/macos/android.sh

@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
 toolsVersion="19.0"
 toolsFile="commandlinetools-mac-13114758_latest.zip"
 toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
-sdkBuildToolsVersion="35.0.1"
-sdkApiLevel="android-35"
+sdkBuildToolsVersion="36.0.0"
+sdkApiLevel="android-36"
 toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24"
 
 ndkVersionLatest="r27c"
@@ -41,11 +41,9 @@ ndkSha1Preview="09be4f8fb626a9c93415198ea8e75d8d82f528fa"
 
 ndkVersionNightly1=$ndkVersionLatest  # Set as same version as latest = skip NDK install in provisioning
 ndkSha1Nightly1=$ndkSha1Latest
+
 ndkVersionNightly2=$ndkVersionLatest
 ndkSha1Nightly2=$ndkSha1Latest
-sdkBuildToolsVersion="36.0.0"
-# this is compile sdk version
-sdkApiLevel="android-36"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"

coin/provisioning/common/macos/install-lipomerge.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-pip3 install --user lipomerge

coin/provisioning/common/macos/mimersql.sh

@@ -7,6 +7,7 @@
 # Mimer SQL is needed for Qt to be able to support Mimer SQL
 
 set -ex
+os="$1"
 
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

coin/provisioning/common/shared/triplets/arm64-osx-qt.cmake

@@ -1,13 +0,0 @@
-set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
-set(VCPKG_OSX_ARCHITECTURES arm64)
-set(VCPKG_TARGET_ARCHITECTURE arm64)
-
-# Default settings of the triplet from the official vcpkg registry
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# Qt custom per-port customizations
-if(PORT MATCHES "openssl")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-    set(VCPKG_FIXUP_ELF_RPATH ON)
-endif()

coin/provisioning/common/shared/triplets/x64-osx-qt.cmake

@@ -1,13 +0,0 @@
-set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
-set(VCPKG_OSX_ARCHITECTURES x86_64)
-set(VCPKG_TARGET_ARCHITECTURE x64)
-
-# Default settings of the triplet from the official vcpkg registry
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# Qt custom per-port customizations
-if(PORT MATCHES "openssl")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-    set(VCPKG_FIXUP_ELF_RPATH ON)
-endif()

coin/provisioning/common/shared/vcpkg-configuration.json

@@ -5,5 +5,5 @@
     "repository": "https://git.qt.io/aledelev/vcpkg",
     "baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
   },
-  "overlay-triplets": [ "./../triplets" ]
+  "overlay-triplets": [ "./../../shared/triplets" ]
 }

coin/provisioning/common/shared/vcpkg_tool_release_tag.txt

@@ -1,4 +1,4 @@
 vcpkg_tool_release_tag=2025-09-03
 windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
 windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
-unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
+linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed

coin/provisioning/common/unix/openssl_for_android.sh

@@ -5,14 +5,12 @@
 # This script install prebuilt OpenSSL which was built against Android NDK 25.
 # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
 
-set -eux
+set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-outputPathBase="${HOME}"
-
 sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
 featureSuffixLatest="_16kb"
@@ -65,110 +63,55 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 EOB
 
-function BuildOutputPath() {
-    local ndkVersion="$1"
-    local suffix="$2"
-    local sslVersion="$3"
-
-    echo "${outputPathBase}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
-}
-
 function InstallPrebuiltOpenssl() {
-    local ndkVersion="$1"
-    local suffix="$2"
-    local sha="$3"
-    local sslVersion="$4"
-    local output_dir="$5"
 
-    local prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
-    local targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    ndkVersion=$1
+    suffix=$2
+    sha=$3
+    sslVersion=$4
+
+    renamed_root="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
+
+    prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
 
     DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
 
-    local tmp_extract
     tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
     unzip -q -o "$targetFile" -d "$tmp_extract"
-    rm -f "$targetFile"
+    sudo rm -f "$targetFile"
 
     # We assume there is only one top-level directory in the openssl zip
-    local temp_openssl_root
     temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
     if [[ -z "$temp_openssl_root" ]]; then
         echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
-        exit 1
+        return 1
     fi
 
-    mv "$temp_openssl_root" "$output_dir"
+    mv "$temp_openssl_root" "$renamed_root"
     rm -rf "$tmp_extract"
 
-    # There have been cases where necessary symlinks are lost when unarchiving.
-    # Force-create them now.
-    local abi_list="arm64-v8a armeabi-v7a x86 x86_64"
-    for abi in $abi_list; do
-        ln -fs "${output_dir}/include" "${output_dir}/${abi}/include"
-        ln -fs "${output_dir}/${abi}/libcrypto_3.so" "${output_dir}/${abi}/libcrypto.so"
-        ln -fs "${output_dir}/${abi}/libssl_3.so" "${output_dir}/${abi}/libssl.so"
-    done
+    opensslHome="${renamed_root}"
 }
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    outputDirNightly1=$(BuildOutputPath \
-        "$ndkVersionNightly1" \
-        "$featureSuffixNightly1" \
-        "$sslVersionForNightly1")
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionNightly1" \
-        "$featureSuffixNightly1" \
-        "$prebuiltOpensslShaNightly1" \
-        "$sslVersionForNightly1" \
-        "$outputDirNightly1"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly1"
-    echo "OpenSSL for Android ${ndkVersionNightly1} = ${sslVersionForNightly1}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionNightly1" "$featureSuffixNightly1" "$prebuiltOpensslShaNightly1" "$sslVersionForNightly1"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    outputDirNightly2=$(BuildOutputPath \
-        "$ndkVersionNightly2" \
-        "$featureSuffixNightly2" \
-        "$sslVersionForNightly2")
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionNightly2" \
-        "$featureSuffixNightly2" \
-        "$prebuiltOpensslShaNightly2" \
-        "$sslVersionForNightly2" \
-        "$outputDirNightly2"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly2"
-    echo "OpenSSL for Android ${ndkVersionNightly2} = ${sslVersionForNightly2}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionNightly2" "$featureSuffixNightly2" "$prebuiltOpensslShaNightly2" "$sslVersionForNightly2"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    outputDirPreview="$(BuildOutputPath \
-        "$ndkVersionPreview" \
-        "$featureSuffixPreview" \
-        "$sslVersionForPreview")"
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionPreview" \
-        "$featureSuffixPreview" \
-        "$prebuiltOpensslShaPreview" \
-        "$sslVersionForPreview" \
-        "$outputDirPreview"
-    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$outputDirPreview"
-    echo "OpenSSL for Android ${ndkVersionPreview} = ${sslVersionForPreview}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionPreview" "$featureSuffixPreview" "$prebuiltOpensslShaPreview" "$sslVersionForPreview"
+    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionPreview = $sslVersionForPreview" >> ~/versions.txt
 fi
 
-outputDirLatest="$(BuildOutputPath \
-    "$ndkVersionLatest" \
-    "$featureSuffixLatest" \
-    "$sslVersionForLatest")"
-
-InstallPrebuiltOpenssl \
-    "$ndkVersionLatest" \
-    "$featureSuffixLatest" \
-    "$prebuiltOpensslShaLatest" \
-    "$sslVersionForLatest" \
-    "$outputDirLatest"
-SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$outputDirLatest"
-echo "OpenSSL for Android ${ndkVersionLatest} = ${sslVersionForLatest}" >> ~/versions.txt
+InstallPrebuiltOpenssl "$ndkVersionLatest" "$featureSuffixLatest" "$prebuiltOpensslShaLatest" "$sslVersionForLatest"
+SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt

coin/provisioning/common/windows/install-nuget.ps1

@@ -1,20 +0,0 @@
-# Copyright (C) 2025 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-. "$PSScriptRoot\helpers.ps1"
-
-$script:nugetVersion = "v6.11.0"
-$script:nugetPackage = "nuget_$nugetVersion.exe"
-$script:packageRoot = "C:\Utils\NuGet\"
-
-$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
-$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
-$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
-$script:package_path = "$packageRoot\\$nugetPackage"
-
-New-Item -ItemType Directory -Path "$packageRoot"
-Download $officialUrl $cachedUrl $package_path
-Verify-Checksum $package_path $sdkChecksumSha1 sha1
-Write-Host "Installing Nuget"
-
-Set-EnvironmentVariable "NUGET_EXE_PATH" "$package_path"

coin/provisioning/common/windows/install-vcpkg-ports-android.ps1

@@ -7,7 +7,9 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
 $vcpkgRoot = "$env:VCPKG_ROOT"
 $vcpkgInstallRoot = "armeabi-v7a-android-qt-tmp"
 
-Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
+Set-Location -Path "$PSScriptRoot\vcpkg"
+Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
+
 Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root $vcpkgInstallRoot --debug"
 
 New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force

coin/provisioning/common/windows/install-vcpkg-ports.ps1

@@ -10,7 +10,9 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
 $vcpkgRoot = "$env:VCPKG_ROOT"
 $vcpkgInstallRoot = "$arch-windows-qt-tmp"
 
-Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
+Set-Location -Path "$PSScriptRoot\vcpkg"
+Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
+
 Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $vcpkginstallroot --debug"
 
 New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force

coin/provisioning/common/windows/install_configure_vcam.ps1

@@ -1,89 +0,0 @@
-# Copyright (C) 2025 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-. "$PSScriptRoot\helpers.ps1"
-
-$script:commitSha    = "1ede7be543c1fb1e230a733d43f5ee042c72d030"
-$script:repoUrl      = "https://git.qt.io/qtmultimedia/WindowsVirtualCamera/-/archive/$commitSha/WindowsVirtualCamera-$commitSha.zip"
-$script:unzip_location    = "C:\Utils\WindowsVirtualCamera"
-$script:download_location = "C:\Windows\Temp\WindowsVirtualCamera.zip"
-
-$script:nuget = [System.Environment]::GetEnvironmentVariable('NUGET_EXE_PATH', [System.EnvironmentVariableTarget]::Machine)
-
-$script:localPath    = "$unzip_location\WindowsVirtualCamera-$commitSha"
-$script:solutionFile = "VCamManager.sln"
-$script:buildConfig  = "Release"
-$script:targetPlatform = "x64"
-$script:dllPath      = "$localPath\$targetPlatform\$buildConfig\VCamSampleSource.dll"
-
-# Save the current location to return later
-$previousLocation = Get-Location
-
-Write-Host "Downloading from $repoUrl to $download_location"
-Invoke-WebRequest -Uri $repoUrl -OutFile $download_location
-Write-Host "Extracting $download_location to $unzip_location"
-Expand-Archive -Path $download_location -DestinationPath $unzip_location
-Remove-Item $download_location
-
-# Ensure we're inside repo folder
-Set-Location $localPath
-
-$hostArch = Get-CpuArchitecture
-$arch = $hostArch
-$result = EnterVSDevShell -HostArch $hostArch -Arch $arch
-if (-Not $result) {
-    return $false
-}
-
-Write-Host "Locating MSBuild"
-$vswhere = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
-
-if (-not (Test-Path $vswhere)) {
-    throw "vswhere.exe not found! Path: $vswhere"
-}
-
-$msbuildPath = & $vswhere `
-        -latest `
-        -products * `
-        -requires Microsoft.Component.MSBuild `
-        -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
-        -find "MSBuild\**\Bin\MSBuild.exe" `
-
-if ($LASTEXITCODE -ne 0 -or -not (Test-Path $msbuildPath)) {
-    throw "MSBuild NOT found. Make sure VS Build Tools are installed."
-}
-Write-Host "MSBuild found: $msbuildPath"
-
-Write-Host "Restoring NuGet packages"
-& $nuget restore $solutionFile
-
-Write-Host "Building solution $solutionFile"
-& "$msbuildPath" $solutionFile `
-    /t:Build `
-    /p:Configuration=$buildConfig `
-    /p:Platform=$targetPlatform `
-    /p:RestorePackagesConfig=true `
-    /m
-
-if ($LASTEXITCODE -eq 0) {
-    Write-Host "Build succeeded"
-} else {
-    Write-Host " Build failed with exit code $LASTEXITCODE"
-    exit $LASTEXITCODE
-}
-
-Write-Host "Registering the Virtual Camera dll"
-regsvr32 /s "$dllPath"
-
-if ($LASTEXITCODE -eq 0) {
-    Write-Host "Register succeeded"
-} else {
-    Write-Host "Register failed with exit code $LASTEXITCODE"
-    exit $LASTEXITCODE
-}
-
-Set-EnvironmentVariable "VCAM_PATH" "$localPath\$targetPlatform\$buildConfig"
-Write-Host "Environment variable VCAM_PATH set to $localPath\$targetPlatform\$buildConfig"
-
-# Return to previous location
-Set-Location $previousLocation

coin/provisioning/common/windows/vcpkg/vcpkg.json

@@ -0,0 +1,14 @@
+{
+  "overrides": [
+    {
+      "name": "openssl",
+      "version": "3.0.7",
+      "port-version": 2
+    }
+  ],
+  "dependencies": [
+    "openssl",
+    "protobuf",
+    "grpc"
+  ]
+}

coin/provisioning/common/windows/winappsdk.ps1

@@ -1,14 +1,20 @@
-# Copyright (C) 2025 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
 . "$PSScriptRoot\helpers.ps1"
 
 # This script installs Windows App SDK
 
+$script:nugetVersion = "v6.11.0"
+$script:nugetPackage = "nuget_$nugetVersion.exe"
 $script:packageRoot = "C:\Utils\WindowsAppSdk\"
 
-$script:package_path = [System.Environment]::GetEnvironmentVariable('NUGET_EXE_PATH', [System.EnvironmentVariableTarget]::Machine)
+$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
+$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
+$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
+$script:package_path = "$packageRoot\\$nugetPackage"
 
+New-Item -ItemType Directory -Path "$packageRoot"
+Download $officialUrl $cachedUrl $package_path
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
+Write-Host "Installing Nuget"
 Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot"
 
 $script:cpuarch = Get-CpuArchitecture

coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh

@@ -252,8 +252,6 @@ installPackages+=(libusb-1.0-0-dev)
 # password management support for Qt Creator
 installPackages+=(libsecret-1-dev)
 installPackages+=(debian-archive-keyring)
-# Keep zoneinfo up-to-date (COIN-1282)
-installPackages+=(tzdata)
 
 
 echo "Running update for apt"

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

@@ -161,8 +161,6 @@ installPackages+=(perl-JSON)
 installPackages+=(perl-Test-Simple) # To install Test::More module for SBOM
 # For qtgrpc build
 installPackages+=(zlib-static)
-# Keep zoneinfo up-to-date (COIN-1282)
-installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/42-install-vcpkg-ports.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh" x64-linux-qt