Update submodules on '6.6.1 in qt/qt5'

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

.github/pull_request_template.md

@@ -1,9 +0,0 @@
-## Qt contribution guidelines
-
-We welcome contributions to Qt!
-
-Note that all contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).
-
-Read the
-[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.
-

.gitmodules

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

CONTRIBUTING.md

@@ -1,8 +0,0 @@
-## Qt contribution guidelines
-
-We welcome contributions to Qt!
-
-Note that we cannot accept pull requests on GitHub. All contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).
-
-Read the
-[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.

_clang-format

@@ -28,8 +28,8 @@ CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
 # We want a space between the type and the star for pointer types.
 PointerBindsToType: false
 
-# We generally use "template <" with space.
-SpaceAfterTemplateKeyword: true
+# We use template< without space.
+SpaceAfterTemplateKeyword: false
 
 # We want to break before the operators, but not before a '='.
 BreakBeforeBinaryOperators: NonAssignment
@@ -106,9 +106,3 @@ AlignEscapedNewlines: Left
 # initializer list in list-initialization.
 SpaceBeforeCpp11BracedList: false
 
----
-# Use the Google-based style for .proto files.
-Language: Proto
-BasedOnStyle: Google
-IndentWidth: 4
-ColumnLimit: 100

cmake/QtSortModuleDependencies.cmake

@@ -1,13 +0,0 @@
-# The script produces the list of qt submodules that are required to build the submodules listed
-# in the QT_BUILD_SUBMODULES variable. The resulting list preserves the required build order.
-# Usage:
-# cmake [-DQT_BUILD_SUBMODULES="<repo;..>"] [-BUILD_<repo>=<TRUE|FALSE>] \
-#    -P <path/to>/qt6/cmake/QtSortModuleDependencies.cmake
-cmake_minimum_required(VERSION 3.16)
-
-include(${CMAKE_CURRENT_LIST_DIR}/QtTopLevelHelpers.cmake)
-
-qt_internal_collect_modules_only(result "${QT_BUILD_SUBMODULES}")
-
-list(JOIN result " " result)
-message("${result}")

cmake/QtTopLevelHelpers.cmake

@@ -505,41 +505,3 @@ function(qt_internal_foreach_repo_run)
     )
     message("Successes: ${count_success}")
 endfunction()
-
-# The function collects repos and dependencies that are required to build
-# repos listed in ARGN. If the BUILD_<repo> is defined the 'repo' will be
-# excluded from the list.
-function(qt_internal_collect_modules_only out_repos)
-    set(initial_modules "${ARGN}")
-    get_filename_component(qt5_repo_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-
-    # Overriding CMAKE_CURRENT_SOURCE_DIR is ugly but works
-    set(CMAKE_CURRENT_SOURCE_DIR "${qt5_repo_dir}")
-    if(NOT initial_modules)
-        qt_internal_find_modules(initial_modules)
-    endif()
-
-    qt_internal_sort_module_dependencies("${initial_modules}" ${out_repos})
-    foreach(module IN LISTS ${out_repos})
-        # Check for unmet dependencies
-        if(DEFINED BUILD_${module} AND NOT BUILD_${module})
-            list(REMOVE_ITEM ${out_repos} ${module})
-            continue()
-        endif()
-        get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
-        get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
-        foreach(dep IN LISTS dependencies)
-            set(required FALSE)
-            if(dep IN_LIST required_deps)
-                set(required TRUE)
-            endif()
-            if(required AND DEFINED BUILD_${dep} AND NOT BUILD_${dep})
-                set(BUILD_${module} FALSE)
-                list(REMOVE_ITEM ${out_repos} ${module})
-                break()
-            endif()
-        endforeach()
-    endforeach()
-
-    set(${out_repos} "${${out_repos}}" PARENT_SCOPE)
-endfunction()

coin/platform_configs/boot2qt-manifest.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/cmake_platforms.yaml

@@ -2,7 +2,6 @@ Version: 2
 Include: [
     cmake_platforms_qemu.yaml,
     cmake_platforms_qemu_qnx710.yaml,
-    cmake_platforms_qemu_vxworks.yaml,
     cmake_platforms_target_android.yaml,
     cmake_platforms_wasm.yaml,
     macos.yaml
@@ -13,8 +12,8 @@ Configurations:
     Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
     Id: 'ubuntu-22.04'
@@ -31,7 +30,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation-x11-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'TestOnly']
+    Features: ['Sccache', 'TestOnly']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-x11-tests'
@@ -71,6 +70,7 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-11_22h2-msvc2019'
@@ -83,6 +83,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-10_22h2-msvc2022'
@@ -92,9 +93,10 @@ Configurations:
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-11_22h2-msvc2022'
@@ -104,9 +106,10 @@ Configurations:
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-10_22h2-msvc2019-developer-build'
@@ -135,6 +138,7 @@ Configurations:
         'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
         'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-11_22h2-msvc2019-developer-build'
@@ -160,6 +164,17 @@ Configurations:
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
+    ]
+-
+    Id: 'rhel-8.6'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
     ]
 -
     Id: 'rhel-8.8'
@@ -169,7 +184,7 @@ Configurations:
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
 -
     Id: 'rhel-9.2'
@@ -199,7 +214,7 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
@@ -216,6 +231,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
     Id: 'windows-10_22h2-llvm'
@@ -229,12 +245,13 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
     Id: 'windows-11_22h2-llvm'
     Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'Clang'
-    Features: ['Packaging','Sccache', 'UseConfigure']
+    Features: ['Sccache', 'UseConfigure']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
     Environment variables: [
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
@@ -242,6 +259,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
     Id: 'windows-10_22h2-mingw11-developer-build'
@@ -252,9 +270,10 @@ Configurations:
     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}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
     Id: 'windows-11_22h2-mingw11-developer-build'
@@ -265,9 +284,10 @@ Configurations:
     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}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
     Id: 'focal-arm64-debian-pkg-packaging'
@@ -275,7 +295,7 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.7_dev',
+        'DEBIAN_RULES_REF=6.6_dev',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
@@ -286,7 +306,7 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.7_dev',
+        'DEBIAN_RULES_REF=6.6_dev',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -12,7 +12,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.24.2/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',
@@ -29,7 +29,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.24.2/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',
@@ -46,7 +46,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.24.2/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

@@ -12,7 +12,7 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.27.7/bin',
+        'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
     ]

coin/platform_configs/cmake_platforms_qemu_vxworks.yaml

@@ -1,15 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'vxworks-imx6'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'ARMv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'Insignificant', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
-    ]

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -8,7 +8,7 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
@@ -23,7 +23,7 @@ Configurations:
     Compiler: 'Mingw'
     Target compiler: 'Clang'
     Platform dependency: 'windows-10_22h2-mingw11'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
@@ -33,33 +33,65 @@ Configurations:
     ]
 -
     Id: 'android-6-x86-on-linux'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-8.6'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_EMULATOR=@emulator_x86_api_23',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
+    ]
+-
+    Id: 'android-6-RHEL-8.8-x86-on-linux'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_api_23'
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}}',
+        'ANDROID_EMULATOR=@emulator_x86_api_23',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'android-14-x86_64-on-linux'
+    Id: 'android-13-x86_64-on-linux'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-8.6'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
+        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
+    ]
+-
+    Id: 'android-13-RHEL-8.8-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_34'
+        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
     ]

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -28,11 +28,12 @@ Configurations:
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include',
     ]
 -
-    Id: 'webassembly-linux-thread'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
+    Id: 'webassembly-macos-thread'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.5-developer-build'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',

coin/platform_configs/flashing-wizard.yaml

@@ -23,6 +23,11 @@ Configurations:
         Target arch: 'x86'
         Features: ['Packaging', 'UseLegacyInstructions']
         Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
+    -
+        Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+        Compiler: 'GCC'
+        Features: ['Packaging', 'UseLegacyInstructions']
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
     -
         Template: 'qtci-linux-RHEL-8.8-x86_64-50'
         Compiler: 'GCC'

coin/platform_configs/integrity.yaml

@@ -6,7 +6,7 @@ Configurations:
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
       Platform dependency: 'ubuntu-22.04'
-      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure', 'Insignificant']
+      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
       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 -no-feature-brotli',
           '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',

coin/platform_configs/linux_android_tests_developer.yaml

@@ -2,6 +2,21 @@ Version: 2
 Configurations:
 -
     Id: 'android-x86-developer-build-testrun-on-linux'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-8.6'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
+        'ANDROID_EMULATOR=@emulator_x86_api_23']
+-
+    Id: 'android-x86-developer-build-testrun-on-linux-RHEL-8.8'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
@@ -13,5 +28,4 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
-        'ANDROID_EMULATOR=emulator_x86_api_23']
+        'ANDROID_EMULATOR=@emulator_x86_api_23']

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -1,5 +1,30 @@
 Version: 2
 Configurations:
+-
+    Id: 'rhel_8.4_android_multi'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: [
+        'rhel-8.6',
+        'android-6-x86-on-linux',
+        'android-13-x86_64-on-linux'
+    ]
+    Features: [
+        'Sccache',
+        'AndroidTestRun',
+        'MinimalAndroidMultiABITests',
+        'InstallDepsPerPlatformSubdir'
+    ]
+    Environment variables: [
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
+        'ANDROID_EMULATOR=@emulator_x86_api_23'
+    ]
 -
     Id: 'rhel_8.8_android_multi'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
@@ -9,20 +34,18 @@ Configurations:
     Target compiler: 'Clang'
     Platform dependency: [
         'rhel-8.8',
-        'android-6-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-6-RHEL-8.8-x86-on-linux',
+        'android-13-RHEL-8.8-x86_64-on-linux'
     ]
     Features: [
         'Sccache',
-        'WarningsAreErrors',
         'AndroidTestRun',
         'MinimalAndroidMultiABITests',
         'InstallDepsPerPlatformSubdir'
     ]
     Environment variables: [
         'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
-        'ANDROID_EMULATOR=emulator_x86_api_23'
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-RHEL-8.8-x86-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-RHEL-8.8-x86_64-on-linux',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
     ]

coin/platform_configs/macos.yaml

@@ -35,14 +35,30 @@ Configurations:
 
     # Test on all supported macOS versions (deployment targets)
 
-    # On x86_64
-
     -
         Id: 'macos-11-x86_64-tests'
         Template: 'qtci-macos-11-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-11-arm64-tests'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-12-arm64-tests'
+        Template: 'qtci-macos-12-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-13-arm64-tests'
+        Template: 'qtci-macos-13-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-x86_64-tests'
         Template: 'qtci-macos-12-x86_64-106'
@@ -55,36 +71,6 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-14-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-
-    # And arm64
-
-    -
-        Id: 'macos-12-arm64-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-14-arm64-tests'
-        Template: 'qtci-macos-14-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-
-    # Test the universal packaging built on arm64
-
     -
         Id: 'macos-12-arm-on-arm64-tests'
         Template: 'qtci-macos-12-arm64'
@@ -103,13 +89,6 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-14-arm-on-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-
     # =========================================================================
     # Developer build. Single architecture builds.
     # =========================================================================
@@ -134,34 +113,47 @@ Configurations:
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
         Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
         ]
+        # Note: We do not include OpenSSL or PostgreSQL in this build,
+        # as the M1 CI machines are not provisioned for that yet.
 
     # Test on all supported macOS versions (deployment targets)
 
+    -
+        Id: 'macos-11-x86_64-developer-build-tests'
+        Template: 'qtci-macos-11-x86_64-106'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-13-x86_64-developer-build'
     -
         Id: 'macos-11-arm64-developer-build-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-13-arm64-developer-build'
+    -
+        Id: 'macos-12-x86_64-developer-build-tests'
+        Template: 'qtci-macos-12-x86_64-106'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-13-x86_64-developer-build'
     -
         Id: 'macos-12-arm64-developer-build-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-13-arm64-developer-build'
+    -
+        Id: 'macos-13-x86_64-developer-build-tests'
+        Template: 'qtci-macos-13-x86_64-103'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-13-x86_64-developer-build'
     -
         Id: 'macos-13-arm64-developer-build-tests'
         Template: 'qtci-macos-13-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-13-arm64-developer-build'
-    -
-        Id: 'macos-14-arm64-developer-build-tests'
-        Template: 'qtci-macos-14-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-13-arm64-developer-build'

coin/platform_configs/meta-boot2qt-aws.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/meta-boot2qt-qcom.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/meta-qsr.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/nightly_macos13.yaml

@@ -0,0 +1,14 @@
+Version: 2
+Module only: True
+Include: [
+    macos.yaml: [
+        "macos-12-x86_64-developer-build"
+    ]
+]
+Configurations:
+-
+    Id: 'macos-13-x86_64-developer-build-tests'
+    Template: 'qtci-macos-13-x86_64-103'
+    Compiler: 'Clang'
+    Features: ['TestOnly']
+    Platform dependency: 'macos-12-x86_64-developer-build'

coin/platform_configs/nightly_macos14_arm.yaml

@@ -1,20 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
--
-    Id: 'macos-14-arm64-developer-build'
-    Template: 'qtci-macos-14-arm64'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
-        'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
-    ]
--
-    Id: 'macos-14-arm64-developer-build-tests'
-    Template: 'qtci-macos-14-arm64'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'macos-14-arm64-developer-build'

coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml

@@ -9,5 +9,5 @@ Configurations:
     Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_clangcpp=OFF'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]

coin/platform_configs/nightly_vxworks.yaml

@@ -1,11 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-    cmake_platforms.yaml: [
-        "ubuntu-22.04"
-    ],
-    cmake_platforms_qemu_vxworks.yaml: [
-        "vxworks-imx6"
-    ]
-]
-Configurations: []

coin/platform_configs/qt-creator.yaml

@@ -15,6 +15,12 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
+-
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Configure arguments: ''
+    Environment variables: []
 -
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/qtapplicationmanager.yaml

@@ -1,13 +1,3 @@
 Version: 2
 Include: [cmake_platforms.yaml]
-Configurations:
--
-    Id: 'ubuntu-22.04-axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DisableTests','Axivion_qtapplicationmanager', 'Insignificant', 'VMSize8']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
+Configurations: []

coin/platform_configs/qtbase.yaml

@@ -5,7 +5,6 @@ Include: [
     integrity.yaml,
     ios-tests.yaml,
     address_sanitizer_platforms.yaml,
-    linux_android_tests_multi_abi.yaml,
-    wasm_qtbase_tests.yaml
+    linux_android_tests_multi_abi.yaml
 ]
 Configurations: []

coin/platform_configs/qtdeclarative.yaml

@@ -3,7 +3,6 @@ Include: [
     cmake_platforms.yaml,
     integrity.yaml,
     ios-tests.yaml,
-    address_sanitizer_platforms.yaml,
     cmake_platforms_static_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtimageformats.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtinterfaceframework.yaml

@@ -1,13 +1,3 @@
 Version: 2
 Include: [cmake_platforms.yaml]
-Configurations:
--
-    Id: 'ubuntu-22.04-axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DisableTests','Axivion_qtinterfaceframework', 'Insignificant', 'VMSize8']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
+Configurations: []

coin/platform_configs/qtlanguageserver.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -13,7 +13,7 @@ Include: [
     "windows-10_22h2-msvc2019",
     "windows-10_22h2-msvc2022",
     "windows-10_22h2-msvc2019-developer-build",
-    "rhel-8.8",
+    "rhel-8.4",
     "windows-10_22h2-mingw11",
     "windows-10_22h2-mingw11-developer-build",
     "windows-10_22h2-llvm",
@@ -37,45 +37,15 @@ Configurations:
     Compiler: 'GCC'
     Platform dependency: 'ubuntu-22.04'
     Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR']
-    Configure arguments: '-nomake examples -release -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    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: [
-        'TARGET_CONFIGURE_ARGS=-release -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 -qtlibinfix TestInfix',
+        '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 -qtlibinfix TestInfix',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.24.2/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',
     ]
--
-    Id: 'Axivion-qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -no-dbus -nomake examples -qtlibinfix TestInfix',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-    ]
--
-    Id: "Axivion-integrity-arm64"
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Target os: 'INTEGRITY'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR', '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 -no-feature-brotli',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
-        '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',
-    ]
+
 

coin/platform_configs/qtsaferenderer.yaml

@@ -12,7 +12,7 @@ Include: [
     "sles-15_sp5-static",
     "windows-10_22h2-msvc2019",
     "windows-10_22h2-msvc2022",
-    "rhel-8.8",
+    "rhel-8.4",
     "windows-10_22h2-mingw11",
     "windows-10_22h2-llvm",
     "windows-11_22h2-msvc2019"
@@ -35,6 +35,15 @@ Configurations:
     Environment variables: [
         'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
     ]
+-
+    Id: 'Linux-RHEL_8_6_Static'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
+    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
+    ]
 -
     Id: 'Linux-RHEL_8_8_Static'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'

coin/platform_configs/qtshadertools.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtsvg.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtwayland.yaml

@@ -8,7 +8,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation-wayland-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-wayland-tests'

coin/platform_configs/tqtc-android-automotive.yaml

@@ -1,6 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
+        'rhel-8.6',
         'rhel-8.8',
         'windows-10_22h2-mingw11',
         'ubuntu-22.04-documentation',
@@ -13,39 +14,39 @@ Include: [
         'android-arm64-on-macos',
         'android-armv7-on-windows',
         'android-6-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-13-x86_64-on-linux'
     ]
 ]
 Configurations:
 -
-    Id: "automotive-android-13-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
+    Id: "automotive-android-12-x86_64-on-linux"
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Platform dependency: 'rhel-8.6'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33'
+        'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31'
     ]
 -
-    Id: "automotive-android-10-x86_64-on-linux"
+    Id: "automotive-android-12-x86_64-on-linux-RHEL-8.8"
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
+        'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31'
     ]

coin/platform_configs/tqtc-qtpip.yaml

@@ -1,12 +0,0 @@
-Version: 2
-Module only: true
-Include: [
-  cmake_platforms.yaml: [
-    "windows-10_22h2-msvc2019",
-    "rhel-8.8"
-  ],
-  macos.yaml: [
-    "macos-universal-on-x86_64"
-  ]
-]
-Configurations: []

coin/platform_configs/wasm_qtbase_tests.yaml

@@ -1,9 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'webassembly-linux-thread-asyncify-tests'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'webassembly-linux-thread-asyncify'

coin/platform_configs/webos.yaml

@@ -2,52 +2,52 @@ Version: 2
 Module only: true
 Configurations:
   - Id: 'webos-emulator-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_EMULATOR=enabled']
   - Id: 'webos-emulator-qtbase-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtbase']
     Platform dependency: 'webos-emulator-build'
   - Id: 'webos-emulator-qtdeclarative-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtdeclarative']
     Platform dependency: 'webos-emulator-build'
   - Id: 'webos-emulator-qtwayland-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtwayland']
     Platform dependency: 'webos-emulator-build'
   - Id: 'webos-emulator-qtshadertools-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtshadertools']
     Platform dependency: 'webos-emulator-build'
   - Id: 'webos-emulator-qtgraphicaleffects-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtgraphicaleffects']
     Platform dependency: 'webos-emulator-build'
   - Id: 'webos-raspberry-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_RASPBERRY=enabled']
   - Id: 'webos-ndk-installer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_NDK_INSTALLER=enabled']
   - Id: 'webos-ndk-install'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']

coin/platform_configs/yocto.yaml

@@ -41,18 +41,3 @@ Configurations:
         Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
         Compiler: 'Yocto'
         Target arch: 'TARGET10'
-    -
-        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-        Compiler: 'Yocto'
-        Features: ['Insignificant']
-        Target arch: 'INSIGNIFICANT_TARGET1'
-    -
-        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-        Compiler: 'Yocto'
-        Features: ['Insignificant']
-        Target arch: 'INSIGNIFICANT_TARGET2'
-    -
-        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-        Compiler: 'Yocto'
-        Features: ['Insignificant']
-        Target arch: 'INSIGNIFICANT_TARGET3'

coin/pre-provisioning/qtci-linux-RHEL-9.0-x86_64/01-disable-automounting.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2021 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
+
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -ex
 

coin/pre-provisioning/qtci-linux-RHEL-9.2-x86_64/01-disable-automounting.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2023 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
+
+#############################################################################
+##
+## Copyright (C) 2023 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -ex
 

coin/pre-provisioning/qtci-linux-Ubuntu-20.04-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,59 +0,0 @@
-### Ubuntu 20.04 ###
-Hard Disk: 1TB
-
-Language: English (United States)
-Time & Date: Etc/Coordinated Universal Time
-Software Selection: Desktop image, minimal install
-
-Language: English (US)
-Typing: English (US)
-Privacy: Location Services: OFF
-Connect Your Online Accounts: Skip
-
-
-# Configure Settings
- Notifications:
-    * Notification Popups: OFF
-    * Lock Screen Notifications: OFF
- Privacy:
-    * Screen Lock: OFF
-    * File History & Rubbish Bin:
-       * File History: Off
-    * Diagnostics:
-       * Send error reports to Canonical: Never
- Power:
-    * Blank screen: Never
-    * Automatic suspend: Off
- Appearance:
-    * Auto-hide the dock: Off
- Devices:
-    * Displays: Resolution 1280 x 800
- Details:
-    * Time Zone: UTC
-       * run "sudo timedatectl set-timezone UTC"
-    * Users: Automatic login on
-
- Software & Updates:
-    * Updates:
-       * Subscribed to: Security updates only
-       * Automatically check for updates: Never
-       * Notify me of a new Ubuntu version: Never
-
-# Add user to sudoers
-Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-
-Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
-run 'sudo grub2-mkconfig'
-
-# Install ssh server
-run 'sudo apt install openssh-server'
-
-# Disable firewall
-run 'sudo ufw disable'
-
-# Fetch and run coin-setup (in Opennebula)
-Download http://coin/coin/binary/linux_amd64/coin-setup
-run './coin-setup'
-
-Reboot
-

coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
 # thus needing its own version.

coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+###########################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt

@@ -1,7 +1,7 @@
 # Install visual studio 2015
 
 version = "2015 update 3"
-installer = "http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_x86_x64_web_installer_6846650.exe"
+installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_x86_x64_web_installer_6846650.exe"
 # Select default values
 # Make sure these are selected:
     * All values from 'Universal Windows App Development Tools'

coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt

@@ -1,12 +1,48 @@
-# Copyright (C) 2020 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
+############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Visual Studio $version version $version_number was installed manually using $installer.
 
 $version = "2017"
 # Current version was manually upgraded from the installer
 $version_number = "15.9.21"
-$installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__1312218103.1526017942.exe"
+$installer = "http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__1312218103.1526017942.exe"
 
 # Following components were selected from installer:
 # Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)

coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 . "$PSScriptRoot\..\common\helpers.ps1"
 
 # Install Visual Studio 2017 Build Tools
@@ -7,4 +43,4 @@
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
 
 $url_internal = https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
-$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/mu_build_tools_for_visual_studio_2017_version_15.0_x86_x64_10254482.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_2017_version_15.0_x86_x64_10254482.exe"

coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt

@@ -3,11 +3,11 @@
 $version = "2019"
 # Current version was manually upgraded from the installer
 $version_number = "16.4.6"
-$installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe"
+$installer = "http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe"
 
 MSVC 2019 build tools (default installation, no additional selections).
     * Install after MSVC2019 is installed!
-    * Installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
     * Version: 16.4.6
 
 Installed MSVC-2019 Components:

coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
 # thus needing its own version.

coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+###########################################################################
+##
+## 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.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt

@@ -15,4 +15,4 @@ $installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_insta
 #   -Visual Studio Extensibility Tools Update 3
 
 # NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
-$sdk_installer = "http://ci-files01-hki.ci.qt.io/input/windows/sdksetup.exe"
+$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt

@@ -7,7 +7,7 @@ $installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__5050
 
 MSVC 2019 build tools (default installation, no additional selections).
     * Install after MSVC2019 is installed!
-    * Installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
     * Version: 16.8.1
 
 Installed MSVC-2019 Components:

coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt

@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/disable-defragment.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
 # thus needing its own version.

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+###########################################################################
+##
+## 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.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/msvc2019.txt

@@ -65,7 +65,7 @@ Windows 10 SDK (10.0.20348.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.2 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.2 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/virtio.txt

@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/disable-defragment.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
 # thus needing its own version.

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+###########################################################################
+##
+## 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.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/msvc2015_update.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2015 ###
-Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
+Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
 (Mount the ISO-image by double clicking it and run 'vs_professional.exe')
 
 default plus following components were selected:

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/msvc2019.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2019 ###
-Visual Studio 2019 version 16.11.7 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
+Visual Studio 2019 version 16.11.7 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
 
 Installed MSVC-2019 Components:
 
@@ -66,7 +66,7 @@ Windows 10 SDK (10.0.22000.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.7 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.7 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/msvc2022.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2022 Official release ###
-Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
 
 Installed MSVC-2022 Components:
 
@@ -60,7 +60,7 @@ Windows Universal C Runtime
 ############################################################
 ### Visual Studio 2022 build tools ###
 
- Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+ Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/virtio.txt

@@ -6,7 +6,7 @@ to using the VirtIO NIC in KVM.
 
 NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.204-1/virtio-win-0.1.204.iso
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.204.iso
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.204.iso
 * Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+###########################################################################
+##
+## 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.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2015_update.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2015 ###
-Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
+Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
 (Mount the ISO-image by double clicking it and run 'vs_professional.exe')
 
 default plus following components were selected:

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/create_windows-11_image_with_virtio_drivers.txt

@@ -2,7 +2,7 @@
 
 # Create Ubuntu 20.04 and install virt-manager:
 Create e.g. Ubuntu 20.04 VM
-Connect to machine and download the ISO-image and virtio-drivers (http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.204.iso or https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.204-1/)
+Connect to machine and download the ISO-image and virtio-drivers (http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.204.iso or https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.204-1/)
 sudo apt update
 sudo apt install virt-manager
 sudo systemctl start libvirtd

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/disable-defragment.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
 # thus needing its own version.

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+###########################################################################
+##
+## 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.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/msvc2015_update.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2015 ###
-Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
+Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
 (Mount the ISO-image by double clicking it and run 'vs_professional.exe')
 
 default plus following components were selected:

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/msvc2019.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2019 ###
-Visual Studio 2019 version 16.11.5 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
+Visual Studio 2019 version 16.11.5 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
 
 Installed MSVC-2019 Components:
 
@@ -66,7 +66,7 @@ Windows 11 SDK (10.0.22000.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.5 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.5 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/msvc2022.txt

@@ -1,7 +1,7 @@
 ### Visual Studio 2022 Preview ###
-Visual Studio 2022 version 17.0.0 preview 7.0 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional_2022_preview.exe
+Visual Studio 2022 version 17.0.0 preview 7.0 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional_2022_preview.exe
 ### Visual Studio 2022 Official release ###
-Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
 
 Installed MSVC-2022 Components:
 
@@ -62,10 +62,10 @@ Windows Universal C Runtime
 ############################################################
 ### Visual Studio 2022 build tools ###
 
-Visual studio 2022 build tools version 17.0.0 preview 7.0 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__msvc2022_preview.exe"
+Visual studio 2022 build tools version 17.0.0 preview 7.0 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__msvc2022_preview.exe"
  * Only default installation, no additional selections
 
- Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+ Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/virtio.txt

@@ -6,7 +6,7 @@ to using the VirtIO NIC in KVM.
 
 NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
 * Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/disable-defragment.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2019 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
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
 # thus needing its own version.

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/disable-windefender.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2020 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
+###########################################################################
+##
+## 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.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # Turning off win defender.
 #

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/disable-windows-updates.ps1

@@ -1,5 +1,41 @@
-# Copyright (C) 2017 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script disables the automatic Windows updates
 

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/msvc2019.txt

@@ -67,7 +67,7 @@ Windows 11 SDK (10.0.22000.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.19 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.19 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 Visual studio 2019 build tools were updated to version 16.11.27 with Visual Studio Installer
 

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/msvc2022.txt

@@ -62,7 +62,7 @@ Windows Universal C Runtime
 ############################################################
 ### Visual Studio 2022 build tools ###
 
- Visual studio 2022 build tools version 17.3.5 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+ Visual studio 2022 build tools version 17.3.5 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
  Visual Studio 2022 build tools were updated to 17.6.4 vith Visual Studio Installer
   * Some of the installed framework versions are out of support and do not get any security updates

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/virtio.txt

@@ -6,7 +6,7 @@ to using the VirtIO NIC in KVM.
 
 NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
 * Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/provisioning/common/linux/android_emulator_launcher.sh

@@ -1,112 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# This util launches the Android emulator and ensures it doesn't stuck/freeze
-# by detecting that and restarting it
-
-set -e
-
-EMULATOR_MAX_RETRIES=5
-ADB_MAX_TIMEOUT=300
-EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator"
-ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb"
-LOGCAT_PATH="$COIN_CTEST_RESULTSDIR/emulator_logcat_%iter.txt"
-EMULATOR_RUN_LOG_PATH="$COIN_CTEST_RESULTSDIR/emulator_run_log_%iter.txt"
-
-if [ -z "${ANDROID_EMULATOR}" ]; then
-    echo "No AVD name provided via ANDROID_EMULATOR env variable. Aborting!"
-    exit 1
-fi
-
-function check_for_android_device
-{
-    $ADB_EXEC devices | awk 'NR==2{print $2}' | grep -qE '^(online|device)$'
-}
-
-# WARNING: On the very first boot of the emulator it happens that the device
-# "finishes" booting and getprop shows bootanim=stopped and
-# boot_completed=1. But sometimes not all packages have been installed (`pm
-# list packages` shows only 16 packages installed), and after around half a
-# minute the boot animation starts spinning (bootanim=running) again despite
-# boot_completed=1 all the time. After some minutes the boot animation stops
-# again and the list of packages contains 80 packages. Only then the device is
-# fully booted, and only then is dev.bootcomplete=1.
-#
-# To reproduce the emulator booting as the first time, you have to delete the
-# cached images found inside $HOME/.android/avd/{avd_name}.avd/ especially the
-# "userdata-qemu.img.qcow2" file.
-function check_if_fully_booted
-{
-    # The "getprop" command separates lines with \r\n so we trim them
-    bootanim=$(      timeout 1 "$ADB_EXEC" shell getprop init.svc.bootanim  | tr -d '\r\n')
-    boot_completed=$(timeout 1 "$ADB_EXEC" shell getprop sys.boot_completed | tr -d '\r\n')
-    bootcomplete=$(  timeout 1 "$ADB_EXEC" shell getprop dev.bootcomplete   | tr -d '\r\n')
-    echo "bootanim=$bootanim boot_completed=$boot_completed bootcomplete=$bootcomplete"
-    [ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
-}
-
-for counter in $(seq ${EMULATOR_MAX_RETRIES})
-do
-    $ADB_EXEC kill-server
-    $ADB_EXEC start-server
-
-    if check_for_android_device
-    then
-        echo "Emulator is already running but it shouldn't be. Terminating it now..."
-        pkill '^qemu-system-' || true
-        sleep 5
-    fi
-
-    LOGCAT_PATH=${LOGCAT_PATH//%iter/${counter}}
-    EMULATOR_RUN_LOG_PATH=${EMULATOR_RUN_LOG_PATH//%iter/${counter}}
-
-    echo "Starting emulator ${ANDROID_EMULATOR}, try ${counter}/${EMULATOR_MAX_RETRIES}" \
-        | tee "${EMULATOR_RUN_LOG_PATH}"
-    $EMULATOR_EXEC -avd "$ANDROID_EMULATOR" \
-        -gpu swiftshader_indirect -no-audio -no-window -no-boot-anim \
-        -cores 4 -memory 16000 -partition-size 4096 \
-        -detect-image-hang -restart-when-stalled -no-snapshot-save \
-        -no-nested-warnings -logcat *:v -logcat-output "${LOGCAT_PATH}" \
-        </dev/null  >"${EMULATOR_RUN_LOG_PATH}" 2>&1 &
-    emulator_pid=$!
-    disown $emulator_pid
-
-    echo "Waiting ${ADB_MAX_TIMEOUT} seconds for emulated device to appear..."
-    timeout ${ADB_MAX_TIMEOUT} "$ADB_EXEC" wait-for-device
-
-    echo "Waiting a few minutes for the emulator to fully boot..."
-    emulator_status=down
-    for _ in $(seq ${ADB_MAX_TIMEOUT})
-    do
-        sleep 1
-
-        if check_for_android_device && check_if_fully_booted
-        then
-            emulator_status=up
-            break
-        fi
-    done
-
-    # If emulator status is still offline after timeout period,
-    # we can assume it's stuck, and we must restart it
-    if [ $emulator_status = up ]
-    then
-        echo "Emulator started successfully"
-        break
-    else
-        if [ "$counter" -lt "$EMULATOR_MAX_RETRIES" ]
-        then
-            echo "Emulator failed to start," \
-                 "forcefully killing current instance and re-starting emulator"
-            kill $emulator_pid || true
-            sleep 5
-        elif [ "$counter" -eq "$EMULATOR_MAX_RETRIES" ]
-        then
-            echo "Emulator failed to start, reached maximum number of retries. Aborting\!"
-            exit 2
-        fi
-    fi
-done
-
-exit 0

coin/provisioning/common/linux/android_linux.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 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
+
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script install Android sdk and ndk.
 
@@ -18,34 +55,25 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-sudo mkdir -p "$sdkTargetFolder"
+sudo mkdir -p $sdkTargetFolder
 
-basePath="http://ci-files01-hki.ci.qt.io/input/android"
+basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r25b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="34.0.0"
-sdkApiLevel="android-34"
+sdkBuildToolsVersion="33.0.1"
+sdkApiLevel="android-33"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
 ndkSha1Default=$ndkSha1Latest
-
-# Android 14 avd zip
-android14SystemZipName="android14system_UPB5_230623_003.tar.gz"
-android14SystemZipSha="9680db449516ad6212525cc53f2bc027cf8b3322"
-android14SystemPath="$basePath/$android14SystemZipName"
-
-# Android Automotive max SDK level image
-sdkApiLevelAutomotiveMax="android-33"
-androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
-androidAutomotiveMaxSha="b020a938ec46af2510047284406e9bed608cad03"
-# Android Automotive min SDK level image
-sdkApiLevelAutomotiveMin="android-29"
-androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
-androidAutomotiveMinSha="e6092585c00f87eb3b20a2eb7fdf6add42342d2f"
+# Android automotive
+sdkApiLevelAutomotive="android-31"
+androidAutomotive12Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
+androidAutomotive="android-automotive"
+androidAutomotive12Sha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -61,7 +89,7 @@ function InstallNdk() {
     ndkVersion=$1
     ndkSha1=$2
 
-    if [[ ! -d "$targetFolder/android-ndk-$ndkVersion" ]]; then
+    if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
 
         ndkFile="android-ndk-$ndkVersion-linux.zip"
         ndkTargetFile="/tmp/$ndkFile"
@@ -104,11 +132,11 @@ if [ "$http_proxy" != "" ]; then
     echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
                    --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port"  \
                    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-        | eval "$sdkmanager_no_progress_bar_cmd"
+        | eval $sdkmanager_no_progress_bar_cmd
 else
     echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
                    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-        | eval "$sdkmanager_no_progress_bar_cmd"
+        | eval $sdkmanager_no_progress_bar_cmd
 fi
 
 echo "Checking the contents of Android SDK..."
@@ -119,25 +147,18 @@ SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
 # shellcheck disable=SC2129
-cat <<EOB >>~/versions.txt
-Android SDK tools = $toolsVersion
-Android SDK Build Tools = $sdkBuildToolsVersion
-Android SDK API level = $sdkApiLevel
-Android NDK = $ndkVersion
-EOB
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt
 
 cd "$sdkTargetFolder/cmdline-tools/tools/bin"
-./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
-echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
-echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
+    | eval $sdkmanager_no_progress_bar_cmd
+echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
+
+echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
 
-echo "Extract stored Android 14 Beta $android14SystemZipName"
-DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
-    "/tmp/$android14SystemZipName"
-sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
 
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
@@ -148,28 +169,12 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \
     -k "system-images;android-33;google_apis;x86_64"
 
-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
-    -k "system-images;android-34;google_apis;x86_64"
-
-echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
-DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
-    "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
-sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -C "$sdkTargetFolder/system-images"
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_33 -c 2048M -f \
-    -k "system-images;${sdkApiLevelAutomotiveMax};android-automotive;x86_64"
-
-echo "Install minimum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMin"
-DownloadURL "$androidAutomotiveMinUrl" "$androidAutomotiveMinUrl" "$androidAutomotiveMinSha" \
-    "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
-sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" -C $sdkTargetFolder/system-images
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_29 -c 2048M -f \
-    -k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64"
+echo "Install $sdkApiLevelAutomotive $androidAutomotive"
+DownloadURL "$androidAutomotive12Url" "$androidAutomotive12Url" "$androidAutomotive12Sha" \
+    "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"
+sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C $sdkTargetFolder/system-images
+echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
+    -k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86_64"
 
 # Purely informative, show the list of avd devices
 ./avdmanager list avd
-
-# To be used by the VMs to start the emulator for tests
-emulator_script_filename="android_emulator_launcher.sh"
-cp "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/${emulator_script_filename}" "${HOME}"
-ANDROID_EMULATOR_RUNNER="${HOME}/${emulator_script_filename}"
-SetEnvVar "ANDROID_EMULATOR_RUNNER" "$ANDROID_EMULATOR_RUNNER"

coin/provisioning/common/linux/apt_wait_loop.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2018 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
+
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -ex
 

coin/provisioning/common/linux/axivion-bauhaus-suite.sh

@@ -17,35 +17,28 @@ DownloadAndExtract () {
     file=$3
 
     DownloadURL "$url" "$url" "$sha" "$file"
-    tar -xzvf "$file"
+    tar -xzvf $file
 
-    rm -rf "$file"
+    rm -rf $file
 }
 
 
 # Axivion Bauhaus Suite
-sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_2-x86_64-gnu_linux.tar.gz"
-targetFile="bauhaus-suite-7_6_2-x86_64-gnu_linux.tar.gz"
-sha1="a47891ec1a258240b72b1b5410413da900b30b14"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
+sha1="20bfa8872b90ff11394098a833d536229425535e"
 cd $HOME
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
 
-# Temporary patch for fixing qt rules
-cd $HOME/bauhaus-suite/lib/scripts/bauhaus/rfg/dynamic
-rm qt_support.py
-wget http://ci-files01-hki.ci.qt.io/input/axivion/qt_support.py
-cd $HOME
-# Temporary patch ends
-
 mkdir $HOME/.bauhaus
 cd "$HOME/.bauhaus"
 wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_20231231.key
-cd "$HOME"
+cd $HOME
 
 #Axivion configuration
-configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config_762.tar.gz"
+configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config.tar.gz"
 configurationTargetFile="axivion_config.tar.gz"
-configSha1="2c5ce2ed2f1a2e8fd8a6a2a07a12c9c7d9e90413"
+configSha1="f3aa53f253fa00c7f3fa64e9fe55aa7f93bc5377"
 DownloadAndExtract "$configurationFile" "$configSha1" "$configurationTargetFile" "$HOME"
 
-echo "Axivion Bauhaus Suite = 7.6.2" >> ~/versions.txt
+echo "Axivion Bauhaus Suite = 7.6.0_wavefront-2022-03-16" >> ~/versions.txt

coin/provisioning/common/linux/bootstrap-autostart.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 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
+
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -ex
 
@@ -11,10 +48,10 @@ set -ex
 wrapper="${HOME}/bootstrap-agent.sh"
 autostart_folder="${HOME}/.config/autostart"
 # This directory should exist. Created in base image (tier 1)
-mkdir -p "${autostart_folder}"
+mkdir -p ${autostart_folder}
 
 # Create autostart desktop file and shell wrapper
-sudo tee "${autostart_folder}/coin-bootstrap-agent.desktop" <<"EOF"
+sudo tee ${autostart_folder}/coin-bootstrap-agent.desktop <<"EOF"
 [Desktop Entry]
 Type=Application
 Exec=/home/qt/bootstrap-agent.sh
@@ -23,7 +60,7 @@ X-GNOME-Autostart-enabled=true
 Name=Coin
 EOF
 
-sudo tee "$wrapper" <<"EOF"
+sudo tee $wrapper <<"EOF"
 #!/bin/sh
 # Wait for network to come up
 x=0
@@ -85,5 +122,5 @@ fi
 EOF
 
 # set owner and permissions
-sudo chown qt:users "$wrapper"
-sudo chmod 755 "$wrapper"
+sudo chown qt:users $wrapper
+sudo chmod 755 $wrapper

coin/provisioning/common/linux/cleanup_cache.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 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
+
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script needs to be called at the end of provisioning, to clean the cache directory
 
@@ -18,7 +55,7 @@ if grep -q "^$QT_USER:" /etc/passwd; then
 else
     echo "(WW) user $QT_USER not found."
     echo "---- skipping cache cleanup."
-    exit 0
+    exit 0;
 fi
 
 # assume /home/qt as ~ won't expand into sudo
@@ -32,11 +69,12 @@ if sudo [ -d "$CACHEDIR" ]; then
        echo "---- removing content:"
 
        # List files and delete in a loop as wildcard won't expand into sudo
-       sudo ls -A1 "$CACHEDIR" | while read -r FILE
-       do
+       FILES=`sudo ls -A1 $CACHEDIR`
+       while read FILE;
+           do
            echo "--- rm -rf $FILE"
            sudo rm -rf "$CACHEDIR/$FILE"
-       done
+       done <<< $FILES
     else
        echo "(**) cache in $CACHEDIR is empty."
     fi
@@ -45,7 +83,7 @@ else
         # replace a cache file with a directory
         echo "(WW) $CACHEDIR is a file."
         echo "---- removing $CACHEDIR."
-        sudo rm -r "$CACHEDIR"
+        sudo rm -rf "$CACHEDIR"
     else
         echo "(WW) cache directory $CACHEDIR not found."
     fi

coin/provisioning/common/linux/cmake_linux.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2016 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
+
+#############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script installs CMake
 
@@ -11,11 +48,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.27"
-version="3.27.7"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
+majorminorversion="3.24"
+version="3.24.2"
+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="83ab00c8432a71cfc81e933ee7b3c3e14d50ad6f"
+SHA1="12627c808674ee5f5bd3a6982176613bbd3ad9db"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-linux-x86_64"
 

coin/provisioning/common/linux/cmake_min_supported.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2016 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
+
+#############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script installs the minimum supported CMake to build Qt
 
@@ -11,7 +48,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 majorminorversion="3.16"
 version="3.16.8"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
+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="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c"
 targetFolder="/opt/cmake-$version"

coin/provisioning/common/linux/disable-ntp_linux.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2018 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
+
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -ex
 
@@ -8,9 +45,9 @@ echo "Disable Network Time Protocol (NTP)"
 
 if uname -a |grep -q "Ubuntu\|Debian" ; then
     sudo timedatectl set-ntp false
-elif grep "PRETTY_NAME" /etc/os-release | grep -q "Leap 15"; then
+elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
     (sudo systemctl stop chronyd && sudo systemctl disable chronyd)
-elif grep -q "SUSE Linux Enterprise Server 15" /etc/os-release; then
+elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
     sudo timedatectl set-ntp false
 else
     sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off

coin/provisioning/common/linux/disable_kwin_overview.sh

@@ -7,7 +7,7 @@ set -f
 QT_USER="qt"
 CONFDIR=".config"
 KWINRC="kwinrc"
-KWC5=$(which kwriteconfig5)
+KWC5=`which kwriteconfig5`
 
 if [ -z "$KWC5" ]; then
     echo "(WW) kwriteconfig5 script not found."

coin/provisioning/common/linux/docker.sh

@@ -1,41 +1,77 @@
 #!/usr/bin/env bash
-# Copyright (C) 2023 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
+
+#############################################################################
+##
+## Copyright (C) 2023 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -e
 
-PROVISIONING_DIR="$(dirname "$0")/../../"
-# shellcheck source=../unix/common.sourced.sh
-source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-# shellcheck source=../unix/DownloadURL.sh
-source "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
 
-localRepo=http://ci-files01-hki.ci.qt.io/input/docker
+PROVISIONING_DIR="$(dirname "$0")/../../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
+
+
+localRepo=http://ci-files01-hki.intra.qt.io/input/docker
 upstreamRepo=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/
 
-function getEachUpstream () {
-    while read -r sha f
-    do DownloadURL "$localRepo/$f" "$upstreamRepo/$f" "$sha"
-    done
-}
-cat <<EOF | getEachUpstream
-2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
-ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
-130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
-EOF
+echo '
+    2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
+    ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
+    130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
+' \
+    | xargs -n2 | while read  sha f
+do
+    DownloadURL  $localRepo/$f  $upstreamRepo/$f  $sha
+done
 
 sudo apt-get -y install  ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
 rm -f                    ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
 
-sudo usermod -a -G docker "$USER"
+sudo usermod -a -G docker $USER
 sudo docker --version
 
 # Download and install the docker-compose extension from https://github.com/docker/compose/releases
 f=docker-compose-$(uname -s)-$(uname -m)
 dockerComposeVersion="v2.15.1"
 DownloadURL  \
-    "$localRepo/$f-${dockerComposeVersion}" \
-    "https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f" \
+    $localRepo/$f-${dockerComposeVersion}  \
+    https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f \
     bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5
 sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
 sudo docker-compose --version
@@ -45,4 +81,4 @@ rm ./docker-compose*
 sudo apt-get install avahi-daemon -y
 
 # Start testserver provisioning
-sudo "$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")/../shared/testserver/docker_testserver.sh"
+sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"

coin/provisioning/common/linux/fbx_linux.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2017 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
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script installs FBX SDK
 
@@ -12,7 +49,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 set -e
 tarballName="fbx20161_2_fbxsdk_linux.tar.gz"
 targetFolder="/opt/fbx"
-cachedUrl="http://ci-files01-hki.ci.qt.io/input/fbx/$tarballName"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName"
 officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName"
 sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605"
 tmpFolder="/tmp"

coin/provisioning/common/linux/gcc.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2021 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
+
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 # This script builds GCC from sources
 
@@ -19,13 +56,13 @@ function InstallGCC() {
 
     tmpFolder="/tmp"
 
-    prebuiltGCC="http://ci-files01-hki.ci.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
+    prebuiltGCC="http://ci-files01-hki.intra.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
     prebuiltTarget="$tmpFolder/gcc-$version-prebuilt.tar.gz"
     installPrefix="/usr/local"
 
     suffixVersion=$(echo "$version" | cut -d "." -f1,2)
     sourceFile="gcc-$version.tar.xz"
-    cachedUrl="http://ci-files01-hki.ci.qt.io/input/gcc/$sourceFile"
+    cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
     officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"
 
     targetFile="$tmpFolder/$sourceFile"