Update qtsaferenderer.yaml, add missing 'Target os' field

Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.

Change-Id: Ib99f38f21c4324bf5ac8f8ef6d41e508aef9e7d7
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>

.gitmodules

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

README.md

@@ -29,7 +29,7 @@ Windows:
 
 1. Open a command prompt.
 2. Ensure that the following tools can be found in the path:
- * Supported compiler (Visual Studio 2022 or later, or MinGW-builds gcc 13.1 or later)
+ * Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 11.2 or later)
  * Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
 
 ```

cmake/QtIRGitHelpers.cmake

@@ -93,15 +93,9 @@ function(qt_ir_run_git_submodule_init submodules working_directory)
     qt_ir_setup_commit_template("${working_directory}" "${working_directory}")
 endfunction()
 
-# Add gerrit remotes to the repository located in the working_directory.
+# Add gerrit remotes to the repository.
-# repo_relative_url is the relative URL of the repository.
+function(qt_ir_add_git_remotes repo_name working_directory)
-# Examples:
+    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/")
-# - qt5
-# - qttools.git
-# - ../playground/qlitehtml.git
-# - ../qt/qttools-litehtml.git
-function(qt_ir_add_git_remotes repo_relative_url working_directory)
-    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
     set(gerrit_repo_url "${gerrit_ssh_base}")
 
     qt_ir_get_option_value(codereview-username username)
@@ -116,10 +110,7 @@ function(qt_ir_add_git_remotes repo_relative_url working_directory)
         string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
     endif()
 
-    set(namespace "qt")
+    string(APPEND gerrit_repo_url "${repo_name}")
-    set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}")
-    qt_ir_normalize_git_url("${repo_relative_url_with_namespace}" normalized_url)
-    string(APPEND gerrit_repo_url "${normalized_url}")
 
     qt_ir_execute_process_and_log_and_handle_error(
         COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}"
@@ -202,21 +193,15 @@ function(qt_ir_clone_one_submodule submodule_name)
     set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}")
 
     set(submodule_url "${submodule_base_git_path}")
-    qt_ir_parse_git_url(
+    qt_ir_has_url_scheme("${submodule_url}" has_url_scheme)
-        URL "${submodule_url}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-    )
-
     if(NOT has_url_scheme AND arg_BASE_URL)
         set(submodule_url "${arg_BASE_URL}${submodule_url}")
-        qt_ir_normalize_git_url("${submodule_url}" submodule_url)
     endif()
 
     qt_ir_get_mirror(mirror_url)
     set(mirror "")
     if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH))
         set(mirror "${mirror_url}${submodule_base_git_path}")
-        qt_ir_normalize_git_url("${mirror}" mirror)
     endif()
 
     set(mirror_or_original_url "${submodule_url}")

cmake/QtIRParsingHelpers.cmake

@@ -40,77 +40,16 @@ function(qt_ir_get_git_config_contents out_var)
     set(${out_var} "${git_output}" PARENT_SCOPE)
 endfunction()
 
-# Parses a git repo url to:
+# Checks whether the given url has a scheme like https:// or is just a
-# - check if the given url has a scheme like https:// or git:// or is just a
+# relative path.
-# relative path with no scheme (possibly containing '../' segments)
+function(qt_ir_has_url_scheme url out_var)
-# - extracts the scheme if it exists
+    string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}")
-# - extracts the url without the scheme
-function(qt_ir_parse_git_url)
-    set(options "")
-    set(oneValueArgs
-        URL
-        OUT_VAR_HAS_URL_SCHEME
-        OUT_VAR_SCHEME
-        OUT_VAR_URL_WITHOUT_SCHEME
-    )
-    set(multiValueArgs "")
-    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    string(REGEX MATCH "^([a-z][a-z0-9+\-.]*://)(.+)" url_scheme_match "${arg_URL}")
-
-    if(url_scheme_match)
-        set(has_url_scheme TRUE)
-        set(scheme "${CMAKE_MATCH_1}")
-        set(url_without_scheme "${CMAKE_MATCH_2}")
-    else()
-        set(has_url_scheme FALSE)
-        set(scheme "")
-        set(url_without_scheme "${url}")
-    endif()
-
-    if(arg_OUT_VAR_HAS_URL_SCHEME)
-        set(${arg_OUT_VAR_HAS_URL_SCHEME} "${has_url_scheme}" PARENT_SCOPE)
-    endif()
-
-    if(arg_OUT_VAR_SCHEME)
-        set(${arg_OUT_VAR_SCHEME} "${scheme}" PARENT_SCOPE)
-    endif()
-
-    if(arg_OUT_VAR_URL_WITHOUT_SCHEME)
-        set(${arg_OUT_VAR_URL_WITHOUT_SCHEME} "${url_without_scheme}" PARENT_SCOPE)
-    endif()
-endfunction()
-
-# Normalizes a url that contains '../' path segments.
-# Removes the '../' segments and the directories that they precede.
-# Example:
-#  git://code.qt.io/qt/../playground/qlitehtml.git
-# will be normalized to:
-#  git://code.qt.io/playground/qlitehtml.git
-function(qt_ir_normalize_git_url url out_var)
-    # The exact perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
-    # That got rid of ../ and ../../ in the path, but it broke down
-    # when more than two '../' segments were present.
-    #
-    # In CMake, we instead parse the url to get the non-scheme suffix,
-    # use get_filename_component(ABSOLUTE) to resolve the url as if it was a relative path
-    # and then re-add the scheme if it was present.
-    qt_ir_parse_git_url(
-        URL "${url}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-        OUT_VAR_SCHEME url_scheme
-        OUT_VAR_URL_WITHOUT_SCHEME url_without_scheme
-    )
-
-    # Note the empty BASE_DIR is important, otherwise the path is relative to
-    # ${CMAKE_CURRENT_SOURCE_DIR}.
-    get_filename_component(normalized_url "${url_without_scheme}" ABSOLUTE BASE_DIR "")
 
     if(has_url_scheme)
-        string(PREPEND normalized_url "${url_scheme}")
+        set(${out_var} TRUE PARENT_SCOPE)
+    else()
+        set(${out_var} FALSE PARENT_SCOPE)
     endif()
-
-    set(${out_var} "${normalized_url}" PARENT_SCOPE)
 endfunction()
 
 # Parses a key-value line from a .git/config or .gitmodules file
@@ -140,22 +79,14 @@ endmacro()
 # url_value
 #   the url where to clone a repo from
 #   in perl script it was called $base
-#   Examples:
+#   e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git'
-#    - '../qtbase.git'
-#    - 'https://code.qt.io/playground/qlitehtml.git'
-#    - '../../playground/qlitehtml.git'
 # parent_repo_base_git_path
 #   the base git path of the parent of the submodule
 #   it is either a relative dir or a full url
 #   in the perl script it was called $my_repo_base,
 #   it was passed as first arg to git_clone_all_submodules,
 #   it was passed the value of $subbases{$module} when doing recursive submodule cloning
-#   Examples:
+#   e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git'
-#    - 'qt5'
-#    - 'tqtc-qt5'
-#    - 'qtdeclarative.git'
-#    - 'qttools.git'
-#    - 'https://code.qt.io/playground/qlitehtml.git'
 #
 # Outputs
 #
@@ -163,21 +94,21 @@ endmacro()
 #   just the value of ${url_value}
 # ${out_var_prefix}_${submodule_name}_base_git_path
 #   the whole url if it has a scheme, otherwise it's the value of
-#   ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments
+#   ${url_value} relative to ${parent_repo_base_git_path}, so all the ../ are collapsed
-#   are collapsed depending on how many path segments are available in
+#   e.g. 'qtdeclarative.git'
-#   ${parent_repo_base_git_path}.
+#        'https://code.qt.io/playground/qlitehtml.git',
-#   Examples:
-#    - 'qtdeclarative.git'
-#    - 'https://code.qt.io/playground/qlitehtml.git'
-#    - '../playground/qlitehtml.git'
 macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path)
-    qt_ir_parse_git_url(
+    qt_ir_has_url_scheme("${url_value}" has_url_scheme)
-        URL "${url_value}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-    )
     if(NOT has_url_scheme)
         set(base_git_path "${parent_repo_base_git_path}/${url_value}")
-        qt_ir_normalize_git_url("${base_git_path}" base_git_path)
+
+        # The exact code perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
+        # That got rid of ../ and ../../ in the path, but it broke down
+        # when more than two ../ were present.
+        # We just use ABSOLUTE to resolve the path and get rid of all ../
+        # Note the empty BASE_DIR is important, otherwise the path is relative to
+        # ${CMAKE_CURRENT_SOURCE_DIR}.
+        get_filename_component(base_git_path "${base_git_path}" ABSOLUTE BASE_DIR "")
     else()
         set(base_git_path "${url_value}")
     endif()

coin/instructions/coin_qt_configure.yaml

@@ -47,20 +47,3 @@ instructions:
       condition: property
       property: features
       contains_value: UseConfigure
-disable_if:
-  condition: or
-  conditions:
-    - condition: property
-      property: target.osVersion
-      in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
-    - condition: and
-      conditions:
-        - condition: property
-          property: target.os
-          equals_value: Windows
-        - condition: property
-          property: target.arch
-          not_equals_property: host.arch
-        - condition: property
-          property: features
-          not_contains_value: "DebianPackaging"

coin/platform_configs/cmake_platforms.yaml

@@ -12,7 +12,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests', 'DocsGenerationV2']
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
@@ -30,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', 'DocsGenerationV2']
+    Features: ['Sccache', 'TestDocs', 'TestOnly']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-x11-tests'
@@ -201,11 +201,22 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
+
+-
+    Id: 'rhel-9.2'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    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',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
+    ]
 -
     Id: 'rhel-9.4'
     Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
     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',

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -15,7 +15,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_22H2-aarch64-55'
+    Template: 'qtci-windows-11_22H2-aarch64-53'
     Compiler: 'MSVC2022'
     Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
     Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'

coin/platform_configs/ios-tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: "ios-tests-on-macos"
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'

coin/platform_configs/macos.yaml

@@ -126,7 +126,7 @@ Configurations:
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -nomake examples -debug -framework'
+        Configure arguments: '-developer-build -nomake examples -release -force-asserts -force-debug-info -separate-debug-info -framework'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',

coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml

@@ -4,7 +4,7 @@ Configurations:
     # cmake_platforms.yaml
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DocsGenerationV2']
+    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
     Id: 'Ubuntu-22.04-xwayland-host'

coin/platform_configs/qmake2cmake.yaml

@@ -9,6 +9,10 @@ Configurations:
     Template: 'qtci-macos-13-x86_64-103'
     Compiler: 'Clang'
     Features: ['DisableTests']
+-
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
 -
     Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/qtbase-new-compiler-testing.yaml

@@ -1,9 +1,9 @@
 Version: 2
 Configurations:
-# Test gcc-12 on RHEL 9.4
+# Test gcc-12 on RHEL 9.2
 -
-    Id: 'rhel-9.4-gcc12'
+    Id: 'rhel-9.2-gcc12'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
@@ -12,3 +12,14 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
     ]
+-
+    Id: 'rhel-9.4-gcc12'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'InsignificantTests']
+    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}',
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
+    ]

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -8,16 +8,15 @@ Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
     "ubuntu-22.04-documentation",
-    "ubuntu-24.04-arm64",
     "opensuse-15.5-developer-build",
     "sles-15_sp5-static",
     "windows-10_22h2-msvc2022",
+    "windows-11_23H2-msvc2022-developer-build",
     "rhel-8.10",
     "windows-10_22h2-mingw13",
     "windows-11_23H2-mingw13-developer-build",
     "windows-11_23H2-llvm",
-    "windows-11_23H2-msvc2022",
+    "windows-11_23H2-msvc2022"
-    "windows-11_22h2-arm64-msvc2022"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",

coin/platform_configs/qtsaferenderer.yaml

@@ -2,21 +2,19 @@ Version: 2
 Include: [
   macos.yaml: [
      "macos-universal-on-x86_64",
-     "macos-14-x86_64-tests",
+     "macos-12-x86_64-tests",
-     "macos-14-arm64-tests"
+     "macos-12-arm-on-arm64-tests"
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
     "ubuntu-22.04-documentation",
-    "ubuntu-24.04-arm64",
     "opensuse-15.5-developer-build",
     "sles-15_sp5-static",
     "windows-10_22h2-msvc2022",
     "rhel-8.10",
     "windows-10_22h2-mingw13",
     "windows-11_23H2-llvm",
-    "windows-11_23H2-msvc2022",
+    "windows-11_23H2-msvc2022"
-    "windows-11_22h2-arm64-msvc2022"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
@@ -27,8 +25,9 @@ Include: [
 # Static build configurations for tools
 Configurations:
 -
-    Id: 'macos-latest-x code-universal-static-build'
+    Id: 'macos-latest-xcode-universal-static-build'
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-12-x86_64-107'
+    Target os: 'MacOS_12_Static'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -39,6 +38,7 @@ Configurations:
 -
     Id: 'Linux-RHEL_8_10_Static'
     Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Target os: 'RHEL_8_10_Static'
     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'
@@ -46,31 +46,10 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
     ]
--
-    Id: 'Ubuntu-24.04-arm64_Static'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-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',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
--
-    Id: 'Windows-MSVC2022-arm64_Static'
-    Template: 'qtci-windows-11_22H2-aarch64-54'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
     Id: 'Windows-MSVC2022_Static'
     Template: 'qtci-windows-10_22H2-x86_64-52'
+    Target os: 'Windows_10_Static'
     Compiler: 'MSVC2022'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'

coin/provisioning/common/linux/android_linux.sh

@@ -136,12 +136,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
 ./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
     | eval "$sdkmanager_no_progress_bar_cmd"
 
-echo "Download and unzip Android Emulator version 35.2.10"
+echo "Download and unzip Android Emulator version 34.1.19"
-emulatorFileName="emulator-linux_x64-12414864.zip"
+emulatorFileName="emulator-linux_x64-11525734.zip"
 emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
 emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
 emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
-emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10"
+emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7"
 DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
 echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
 sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"

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

@@ -1,10 +0,0 @@
-{
-    "_Layers": [
-        "post_processing.py",
-        "ci_config.json",
-        "ci_config_common.json",
-        "compiler_config.json",
-        "rule_config.json",
-        "code_annotations.json"
-    ]
-}

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

@@ -1,33 +0,0 @@
-{
-    "Project": {
-        "Git": {
-            "_active": true,
-            "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git",
-            "sourceserver_remote_url": "ssh://codereview.qt-project.org:29418/qt/$(env:TESTED_MODULE_COIN)"
-        },
-        "Project-GlobalOptions": {
-            "ci_mode": {
-                "clean_before": false
-            },
-            "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
-            "ir": "$(env:IRNAME)",
-            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_dev_$(env:TARGET_OS_COIN)"
-        }
-    },
-    "Results": {
-        "Dashboard": {
-            "ci_mode": {
-                "directory": "/data/axivion/databases"
-            },
-            "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/"
-        }
-    },
-    "_Format": "1.0",
-    "_Version": "7.6.2",
-    "_VersionNum": [
-        7,
-        6,
-        2,
-        12725
-    ]
-}

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

@@ -1,32 +0,0 @@
-{
-    "Analysis": {
-        "CatchMalformedComments": {
-            "_active": true
-        },
-        "EnableDisable": {
-            "_active": true
-        },
-        "NextLine": {
-            "_active": true
-        },
-        "ReportUnclosedRestOfFileComments": {
-            "_active": true
-        },
-        "ReportUnusedComments": {
-            "_active": true
-        }
-    },
-    "Results": {
-        "Dashboard": {
-            "import_suppressed_issues": true
-        }
-    },
-    "_Format": "1.0",
-    "_Version": "trunk-d23a11ca62e",
-    "_VersionNum": [
-        7,
-        8,
-        0,
-        14394
-    ]
-}

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

@@ -1,786 +0,0 @@
-{
-    "Project": {
-        "GNUToolchain": {
-            "_active": true,
-            "advanced": {
-                "no_macro_invocations_for_system_headers": false
-            },
-            "archiver": {
-                "native_archiver": "/usr/bin/ar"
-            },
-            "language_c": {
-                "emulated_compiler": "GNU",
-                "emulated_compiler_version": 90300,
-                "language_version": "C18",
-                "native_compiler": "/usr/bin/gcc",
-                "preprocessing": {
-                    "predefined_macros": {
-                        "_LP64": "1",
-                        "_STDC_PREDEF_H": "1",
-                        "__ATOMIC_ACQUIRE": "2",
-                        "__ATOMIC_ACQ_REL": "4",
-                        "__ATOMIC_CONSUME": "1",
-                        "__ATOMIC_HLE_ACQUIRE": "65536",
-                        "__ATOMIC_HLE_RELEASE": "131072",
-                        "__ATOMIC_RELAXED": "0",
-                        "__ATOMIC_RELEASE": "3",
-                        "__ATOMIC_SEQ_CST": "5",
-                        "__BIGGEST_ALIGNMENT__": "16",
-                        "__BYTE_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__CHAR_BIT__": "8",
-                        "__DBL_DECIMAL_DIG__": "17",
-                        "__DBL_DENORM_MIN__": "((double)4.94065645841246544176568792868221372e-324L)",
-                        "__DBL_DIG__": "15",
-                        "__DBL_EPSILON__": "((double)2.22044604925031308084726333618164062e-16L)",
-                        "__DBL_HAS_DENORM__": "1",
-                        "__DBL_HAS_INFINITY__": "1",
-                        "__DBL_HAS_QUIET_NAN__": "1",
-                        "__DBL_MANT_DIG__": "53",
-                        "__DBL_MAX_10_EXP__": "308",
-                        "__DBL_MAX_EXP__": "1024",
-                        "__DBL_MAX__": "((double)1.79769313486231570814527423731704357e+308L)",
-                        "__DBL_MIN_10_EXP__": "(-307)",
-                        "__DBL_MIN_EXP__": "(-1021)",
-                        "__DBL_MIN__": "((double)2.22507385850720138309023271733240406e-308L)",
-                        "__DEC128_EPSILON__": "1E-33DL",
-                        "__DEC128_MANT_DIG__": "34",
-                        "__DEC128_MAX_EXP__": "6145",
-                        "__DEC128_MAX__": "9.999999999999999999999999999999999E6144DL",
-                        "__DEC128_MIN_EXP__": "(-6142)",
-                        "__DEC128_MIN__": "1E-6143DL",
-                        "__DEC128_SUBNORMAL_MIN__": "0.000000000000000000000000000000001E-6143DL",
-                        "__DEC32_EPSILON__": "1E-6DF",
-                        "__DEC32_MANT_DIG__": "7",
-                        "__DEC32_MAX_EXP__": "97",
-                        "__DEC32_MAX__": "9.999999E96DF",
-                        "__DEC32_MIN_EXP__": "(-94)",
-                        "__DEC32_MIN__": "1E-95DF",
-                        "__DEC32_SUBNORMAL_MIN__": "0.000001E-95DF",
-                        "__DEC64_EPSILON__": "1E-15DD",
-                        "__DEC64_MANT_DIG__": "16",
-                        "__DEC64_MAX_EXP__": "385",
-                        "__DEC64_MAX__": "9.999999999999999E384DD",
-                        "__DEC64_MIN_EXP__": "(-382)",
-                        "__DEC64_MIN__": "1E-383DD",
-                        "__DEC64_SUBNORMAL_MIN__": "0.000000000000001E-383DD",
-                        "__DECIMAL_BID_FORMAT__": "1",
-                        "__DECIMAL_DIG__": "21",
-                        "__DEC_EVAL_METHOD__": "2",
-                        "__ELF__": "1",
-                        "__FINITE_MATH_ONLY__": "0",
-                        "__FLOAT_WORD_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__FLT128_DECIMAL_DIG__": "36",
-                        "__FLT128_DENORM_MIN__": "6.47517511943802511092443895822764655e-4966F128",
-                        "__FLT128_DIG__": "33",
-                        "__FLT128_EPSILON__": "1.92592994438723585305597794258492732e-34F128",
-                        "__FLT128_HAS_DENORM__": "1",
-                        "__FLT128_HAS_INFINITY__": "1",
-                        "__FLT128_HAS_QUIET_NAN__": "1",
-                        "__FLT128_MANT_DIG__": "113",
-                        "__FLT128_MAX_10_EXP__": "4932",
-                        "__FLT128_MAX_EXP__": "16384",
-                        "__FLT128_MAX__": "1.18973149535723176508575932662800702e+4932F128",
-                        "__FLT128_MIN_10_EXP__": "(-4931)",
-                        "__FLT128_MIN_EXP__": "(-16381)",
-                        "__FLT128_MIN__": "3.36210314311209350626267781732175260e-4932F128",
-                        "__FLT32X_DECIMAL_DIG__": "17",
-                        "__FLT32X_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F32x",
-                        "__FLT32X_DIG__": "15",
-                        "__FLT32X_EPSILON__": "2.22044604925031308084726333618164062e-16F32x",
-                        "__FLT32X_HAS_DENORM__": "1",
-                        "__FLT32X_HAS_INFINITY__": "1",
-                        "__FLT32X_HAS_QUIET_NAN__": "1",
-                        "__FLT32X_MANT_DIG__": "53",
-                        "__FLT32X_MAX_10_EXP__": "308",
-                        "__FLT32X_MAX_EXP__": "1024",
-                        "__FLT32X_MAX__": "1.79769313486231570814527423731704357e+308F32x",
-                        "__FLT32X_MIN_10_EXP__": "(-307)",
-                        "__FLT32X_MIN_EXP__": "(-1021)",
-                        "__FLT32X_MIN__": "2.22507385850720138309023271733240406e-308F32x",
-                        "__FLT32_DECIMAL_DIG__": "9",
-                        "__FLT32_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F32",
-                        "__FLT32_DIG__": "6",
-                        "__FLT32_EPSILON__": "1.19209289550781250000000000000000000e-7F32",
-                        "__FLT32_HAS_DENORM__": "1",
-                        "__FLT32_HAS_INFINITY__": "1",
-                        "__FLT32_HAS_QUIET_NAN__": "1",
-                        "__FLT32_MANT_DIG__": "24",
-                        "__FLT32_MAX_10_EXP__": "38",
-                        "__FLT32_MAX_EXP__": "128",
-                        "__FLT32_MAX__": "3.40282346638528859811704183484516925e+38F32",
-                        "__FLT32_MIN_10_EXP__": "(-37)",
-                        "__FLT32_MIN_EXP__": "(-125)",
-                        "__FLT32_MIN__": "1.17549435082228750796873653722224568e-38F32",
-                        "__FLT64X_DECIMAL_DIG__": "21",
-                        "__FLT64X_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951F64x",
-                        "__FLT64X_DIG__": "18",
-                        "__FLT64X_EPSILON__": "1.08420217248550443400745280086994171e-19F64x",
-                        "__FLT64X_HAS_DENORM__": "1",
-                        "__FLT64X_HAS_INFINITY__": "1",
-                        "__FLT64X_HAS_QUIET_NAN__": "1",
-                        "__FLT64X_MANT_DIG__": "64",
-                        "__FLT64X_MAX_10_EXP__": "4932",
-                        "__FLT64X_MAX_EXP__": "16384",
-                        "__FLT64X_MAX__": "1.18973149535723176502126385303097021e+4932F64x",
-                        "__FLT64X_MIN_10_EXP__": "(-4931)",
-                        "__FLT64X_MIN_EXP__": "(-16381)",
-                        "__FLT64X_MIN__": "3.36210314311209350626267781732175260e-4932F64x",
-                        "__FLT64_DECIMAL_DIG__": "17",
-                        "__FLT64_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F64",
-                        "__FLT64_DIG__": "15",
-                        "__FLT64_EPSILON__": "2.22044604925031308084726333618164062e-16F64",
-                        "__FLT64_HAS_DENORM__": "1",
-                        "__FLT64_HAS_INFINITY__": "1",
-                        "__FLT64_HAS_QUIET_NAN__": "1",
-                        "__FLT64_MANT_DIG__": "53",
-                        "__FLT64_MAX_10_EXP__": "308",
-                        "__FLT64_MAX_EXP__": "1024",
-                        "__FLT64_MAX__": "1.79769313486231570814527423731704357e+308F64",
-                        "__FLT64_MIN_10_EXP__": "(-307)",
-                        "__FLT64_MIN_EXP__": "(-1021)",
-                        "__FLT64_MIN__": "2.22507385850720138309023271733240406e-308F64",
-                        "__FLT_DECIMAL_DIG__": "9",
-                        "__FLT_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F",
-                        "__FLT_DIG__": "6",
-                        "__FLT_EPSILON__": "1.19209289550781250000000000000000000e-7F",
-                        "__FLT_EVAL_METHOD_TS_18661_3__": "0",
-                        "__FLT_EVAL_METHOD__": "0",
-                        "__FLT_HAS_DENORM__": "1",
-                        "__FLT_HAS_INFINITY__": "1",
-                        "__FLT_HAS_QUIET_NAN__": "1",
-                        "__FLT_MANT_DIG__": "24",
-                        "__FLT_MAX_10_EXP__": "38",
-                        "__FLT_MAX_EXP__": "128",
-                        "__FLT_MAX__": "3.40282346638528859811704183484516925e+38F",
-                        "__FLT_MIN_10_EXP__": "(-37)",
-                        "__FLT_MIN_EXP__": "(-125)",
-                        "__FLT_MIN__": "1.17549435082228750796873653722224568e-38F",
-                        "__FLT_RADIX__": "2",
-                        "__FXSR__": "1",
-                        "__GCC_ASM_FLAG_OUTPUTS__": "1",
-                        "__GCC_ATOMIC_BOOL_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR16_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR32_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_INT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LLONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_POINTER_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_SHORT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL": "1",
-                        "__GCC_ATOMIC_WCHAR_T_LOCK_FREE": "2",
-                        "__GCC_HAVE_DWARF2_CFI_ASM": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8": "1",
-                        "__GCC_IEC_559": "2",
-                        "__GCC_IEC_559_COMPLEX": "2",
-                        "__GXX_ABI_VERSION": "1013",
-                        "__HAVE_SPECULATION_SAFE_VALUE": "1",
-                        "__INT16_C(c)": "c",
-                        "__INT16_MAX__": "0x7fff",
-                        "__INT16_TYPE__": "short int",
-                        "__INT32_C(c)": "c",
-                        "__INT32_MAX__": "0x7fffffff",
-                        "__INT32_TYPE__": "int",
-                        "__INT64_C(c)": "c ## L",
-                        "__INT64_MAX__": "0x7fffffffffffffffL",
-                        "__INT64_TYPE__": "long int",
-                        "__INT8_C(c)": "c",
-                        "__INT8_MAX__": "0x7f",
-                        "__INT8_TYPE__": "signed char",
-                        "__INTMAX_C(c)": "c ## L",
-                        "__INTMAX_MAX__": "0x7fffffffffffffffL",
-                        "__INTMAX_TYPE__": "long int",
-                        "__INTMAX_WIDTH__": "64",
-                        "__INTPTR_MAX__": "0x7fffffffffffffffL",
-                        "__INTPTR_TYPE__": "long int",
-                        "__INTPTR_WIDTH__": "64",
-                        "__INT_FAST16_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST16_TYPE__": "long int",
-                        "__INT_FAST16_WIDTH__": "64",
-                        "__INT_FAST32_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST32_TYPE__": "long int",
-                        "__INT_FAST32_WIDTH__": "64",
-                        "__INT_FAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST64_TYPE__": "long int",
-                        "__INT_FAST64_WIDTH__": "64",
-                        "__INT_FAST8_MAX__": "0x7f",
-                        "__INT_FAST8_TYPE__": "signed char",
-                        "__INT_FAST8_WIDTH__": "8",
-                        "__INT_LEAST16_MAX__": "0x7fff",
-                        "__INT_LEAST16_TYPE__": "short int",
-                        "__INT_LEAST16_WIDTH__": "16",
-                        "__INT_LEAST32_MAX__": "0x7fffffff",
-                        "__INT_LEAST32_TYPE__": "int",
-                        "__INT_LEAST32_WIDTH__": "32",
-                        "__INT_LEAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_LEAST64_TYPE__": "long int",
-                        "__INT_LEAST64_WIDTH__": "64",
-                        "__INT_LEAST8_MAX__": "0x7f",
-                        "__INT_LEAST8_TYPE__": "signed char",
-                        "__INT_LEAST8_WIDTH__": "8",
-                        "__INT_MAX__": "0x7fffffff",
-                        "__INT_WIDTH__": "32",
-                        "__LDBL_DECIMAL_DIG__": "21",
-                        "__LDBL_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951L",
-                        "__LDBL_DIG__": "18",
-                        "__LDBL_EPSILON__": "1.08420217248550443400745280086994171e-19L",
-                        "__LDBL_HAS_DENORM__": "1",
-                        "__LDBL_HAS_INFINITY__": "1",
-                        "__LDBL_HAS_QUIET_NAN__": "1",
-                        "__LDBL_MANT_DIG__": "64",
-                        "__LDBL_MAX_10_EXP__": "4932",
-                        "__LDBL_MAX_EXP__": "16384",
-                        "__LDBL_MAX__": "1.18973149535723176502126385303097021e+4932L",
-                        "__LDBL_MIN_10_EXP__": "(-4931)",
-                        "__LDBL_MIN_EXP__": "(-16381)",
-                        "__LDBL_MIN__": "3.36210314311209350626267781732175260e-4932L",
-                        "__LONG_LONG_MAX__": "0x7fffffffffffffffLL",
-                        "__LONG_LONG_WIDTH__": "64",
-                        "__LONG_MAX__": "0x7fffffffffffffffL",
-                        "__LONG_WIDTH__": "64",
-                        "__LP64__": "1",
-                        "__MMX__": "1",
-                        "__NO_INLINE__": "1",
-                        "__ORDER_BIG_ENDIAN__": "4321",
-                        "__ORDER_LITTLE_ENDIAN__": "1234",
-                        "__ORDER_PDP_ENDIAN__": "3412",
-                        "__PRAGMA_REDEFINE_EXTNAME": "1",
-                        "__PTRDIFF_MAX__": "0x7fffffffffffffffL",
-                        "__PTRDIFF_TYPE__": "long int",
-                        "__PTRDIFF_WIDTH__": "64",
-                        "__REGISTER_PREFIX__": "",
-                        "__SCHAR_MAX__": "0x7f",
-                        "__SCHAR_WIDTH__": "8",
-                        "__SEG_FS": "1",
-                        "__SEG_GS": "1",
-                        "__SHRT_MAX__": "0x7fff",
-                        "__SHRT_WIDTH__": "16",
-                        "__SIG_ATOMIC_MAX__": "0x7fffffff",
-                        "__SIG_ATOMIC_MIN__": "(-__SIG_ATOMIC_MAX__ - 1)",
-                        "__SIG_ATOMIC_TYPE__": "int",
-                        "__SIG_ATOMIC_WIDTH__": "32",
-                        "__SIZEOF_DOUBLE__": "8",
-                        "__SIZEOF_FLOAT128__": "16",
-                        "__SIZEOF_FLOAT80__": "16",
-                        "__SIZEOF_FLOAT__": "4",
-                        "__SIZEOF_INT128__": "16",
-                        "__SIZEOF_INT__": "4",
-                        "__SIZEOF_LONG_DOUBLE__": "16",
-                        "__SIZEOF_LONG_LONG__": "8",
-                        "__SIZEOF_LONG__": "8",
-                        "__SIZEOF_POINTER__": "8",
-                        "__SIZEOF_PTRDIFF_T__": "8",
-                        "__SIZEOF_SHORT__": "2",
-                        "__SIZEOF_SIZE_T__": "8",
-                        "__SIZEOF_WCHAR_T__": "4",
-                        "__SIZEOF_WINT_T__": "4",
-                        "__SIZE_MAX__": "0xffffffffffffffffUL",
-                        "__SIZE_TYPE__": "long unsigned int",
-                        "__SIZE_WIDTH__": "64",
-                        "__SSE2_MATH__": "1",
-                        "__SSE2__": "1",
-                        "__SSE_MATH__": "1",
-                        "__SSE__": "1",
-                        "__STDC_HOSTED__": "1",
-                        "__STDC_IEC_559_COMPLEX__": "1",
-                        "__STDC_IEC_559__": "1",
-                        "__STDC_ISO_10646__": "201706L",
-                        "__STDC_UTF_16__": "1",
-                        "__STDC_UTF_32__": "1",
-                        "__UINT16_C(c)": "c",
-                        "__UINT16_MAX__": "0xffff",
-                        "__UINT16_TYPE__": "short unsigned int",
-                        "__UINT32_C(c)": "c ## U",
-                        "__UINT32_MAX__": "0xffffffffU",
-                        "__UINT32_TYPE__": "unsigned int",
-                        "__UINT64_C(c)": "c ## UL",
-                        "__UINT64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT64_TYPE__": "long unsigned int",
-                        "__UINT8_C(c)": "c",
-                        "__UINT8_MAX__": "0xff",
-                        "__UINT8_TYPE__": "unsigned char",
-                        "__UINTMAX_C(c)": "c ## UL",
-                        "__UINTMAX_MAX__": "0xffffffffffffffffUL",
-                        "__UINTMAX_TYPE__": "long unsigned int",
-                        "__UINTPTR_MAX__": "0xffffffffffffffffUL",
-                        "__UINTPTR_TYPE__": "long unsigned int",
-                        "__UINT_FAST16_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST16_TYPE__": "long unsigned int",
-                        "__UINT_FAST32_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST32_TYPE__": "long unsigned int",
-                        "__UINT_FAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST64_TYPE__": "long unsigned int",
-                        "__UINT_FAST8_MAX__": "0xff",
-                        "__UINT_FAST8_TYPE__": "unsigned char",
-                        "__UINT_LEAST16_MAX__": "0xffff",
-                        "__UINT_LEAST16_TYPE__": "short unsigned int",
-                        "__UINT_LEAST32_MAX__": "0xffffffffU",
-                        "__UINT_LEAST32_TYPE__": "unsigned int",
-                        "__UINT_LEAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_LEAST64_TYPE__": "long unsigned int",
-                        "__UINT_LEAST8_MAX__": "0xff",
-                        "__UINT_LEAST8_TYPE__": "unsigned char",
-                        "__USER_LABEL_PREFIX__": "",
-                        "__WCHAR_MAX__": "0x7fffffff",
-                        "__WCHAR_MIN__": "(-__WCHAR_MAX__ - 1)",
-                        "__WCHAR_TYPE__": "int",
-                        "__WCHAR_WIDTH__": "32",
-                        "__WINT_MAX__": "0xffffffffU",
-                        "__WINT_MIN__": "0U",
-                        "__WINT_TYPE__": "unsigned int",
-                        "__WINT_WIDTH__": "32",
-                        "__amd64": "1",
-                        "__amd64__": "1",
-                        "__code_model_small__": "1",
-                        "__gnu_linux__": "1",
-                        "__k8": "1",
-                        "__k8__": "1",
-                        "__linux": "1",
-                        "__linux__": "1",
-                        "__unix": "1",
-                        "__unix__": "1",
-                        "__x86_64": "1",
-                        "__x86_64__": "1",
-                        "linux": "1",
-                        "unix": "1"
-                    },
-                    "sys_include_envvar": null,
-                    "sys_include_path": [
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include",
-                        "/usr/local/include",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed",
-                        "/usr/include/x86_64-linux-gnu",
-                        "/usr/include"
-                    ]
-                }
-            },
-            "language_c.command.#": "/usr/bin/gcc",
-            "language_c.info.#": "Using built-in specs.\nCOLLECT_GCC=/usr/bin/gcc\nCOLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/x86_64-pc-linux-gnu/9.3.0/lto-wrapper\nTarget: x86_64-pc-linux-gnu\nConfigured with: /tmp/gcc-9.3.0/configure --disable-bootstrap --enable-languages=c,c++,lto --prefix=/usr/local --program-suffix=-9.3\nThread model: posix\ngcc version 9.3.0 (GCC) \n",
-            "language_cxx": {
-                "emulated_compiler": "GNU",
-                "emulated_compiler_version": 90300,
-                "language_version": "Cpp14",
-                "native_compiler": "/usr/bin/g++",
-                "preprocessing": {
-                    "predefined_macros": {
-                        "_GNU_SOURCE": "1",
-                        "_LP64": "1",
-                        "_STDC_PREDEF_H": "1",
-                        "__ATOMIC_ACQUIRE": "2",
-                        "__ATOMIC_ACQ_REL": "4",
-                        "__ATOMIC_CONSUME": "1",
-                        "__ATOMIC_HLE_ACQUIRE": "65536",
-                        "__ATOMIC_HLE_RELEASE": "131072",
-                        "__ATOMIC_RELAXED": "0",
-                        "__ATOMIC_RELEASE": "3",
-                        "__ATOMIC_SEQ_CST": "5",
-                        "__BIGGEST_ALIGNMENT__": "16",
-                        "__BYTE_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__CHAR_BIT__": "8",
-                        "__DBL_DECIMAL_DIG__": "17",
-                        "__DBL_DENORM_MIN__": "double(4.94065645841246544176568792868221372e-324L)",
-                        "__DBL_DIG__": "15",
-                        "__DBL_EPSILON__": "double(2.22044604925031308084726333618164062e-16L)",
-                        "__DBL_HAS_DENORM__": "1",
-                        "__DBL_HAS_INFINITY__": "1",
-                        "__DBL_HAS_QUIET_NAN__": "1",
-                        "__DBL_MANT_DIG__": "53",
-                        "__DBL_MAX_10_EXP__": "308",
-                        "__DBL_MAX_EXP__": "1024",
-                        "__DBL_MAX__": "double(1.79769313486231570814527423731704357e+308L)",
-                        "__DBL_MIN_10_EXP__": "(-307)",
-                        "__DBL_MIN_EXP__": "(-1021)",
-                        "__DBL_MIN__": "double(2.22507385850720138309023271733240406e-308L)",
-                        "__DEC128_EPSILON__": "1E-33DL",
-                        "__DEC128_MANT_DIG__": "34",
-                        "__DEC128_MAX_EXP__": "6145",
-                        "__DEC128_MAX__": "9.999999999999999999999999999999999E6144DL",
-                        "__DEC128_MIN_EXP__": "(-6142)",
-                        "__DEC128_MIN__": "1E-6143DL",
-                        "__DEC128_SUBNORMAL_MIN__": "0.000000000000000000000000000000001E-6143DL",
-                        "__DEC32_EPSILON__": "1E-6DF",
-                        "__DEC32_MANT_DIG__": "7",
-                        "__DEC32_MAX_EXP__": "97",
-                        "__DEC32_MAX__": "9.999999E96DF",
-                        "__DEC32_MIN_EXP__": "(-94)",
-                        "__DEC32_MIN__": "1E-95DF",
-                        "__DEC32_SUBNORMAL_MIN__": "0.000001E-95DF",
-                        "__DEC64_EPSILON__": "1E-15DD",
-                        "__DEC64_MANT_DIG__": "16",
-                        "__DEC64_MAX_EXP__": "385",
-                        "__DEC64_MAX__": "9.999999999999999E384DD",
-                        "__DEC64_MIN_EXP__": "(-382)",
-                        "__DEC64_MIN__": "1E-383DD",
-                        "__DEC64_SUBNORMAL_MIN__": "0.000000000000001E-383DD",
-                        "__DECIMAL_BID_FORMAT__": "1",
-                        "__DECIMAL_DIG__": "21",
-                        "__DEC_EVAL_METHOD__": "2",
-                        "__DEPRECATED": "1",
-                        "__ELF__": "1",
-                        "__FINITE_MATH_ONLY__": "0",
-                        "__FLOAT_WORD_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__FLT128_DECIMAL_DIG__": "36",
-                        "__FLT128_DENORM_MIN__": "6.47517511943802511092443895822764655e-4966F128",
-                        "__FLT128_DIG__": "33",
-                        "__FLT128_EPSILON__": "1.92592994438723585305597794258492732e-34F128",
-                        "__FLT128_HAS_DENORM__": "1",
-                        "__FLT128_HAS_INFINITY__": "1",
-                        "__FLT128_HAS_QUIET_NAN__": "1",
-                        "__FLT128_MANT_DIG__": "113",
-                        "__FLT128_MAX_10_EXP__": "4932",
-                        "__FLT128_MAX_EXP__": "16384",
-                        "__FLT128_MAX__": "1.18973149535723176508575932662800702e+4932F128",
-                        "__FLT128_MIN_10_EXP__": "(-4931)",
-                        "__FLT128_MIN_EXP__": "(-16381)",
-                        "__FLT128_MIN__": "3.36210314311209350626267781732175260e-4932F128",
-                        "__FLT32X_DECIMAL_DIG__": "17",
-                        "__FLT32X_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F32x",
-                        "__FLT32X_DIG__": "15",
-                        "__FLT32X_EPSILON__": "2.22044604925031308084726333618164062e-16F32x",
-                        "__FLT32X_HAS_DENORM__": "1",
-                        "__FLT32X_HAS_INFINITY__": "1",
-                        "__FLT32X_HAS_QUIET_NAN__": "1",
-                        "__FLT32X_MANT_DIG__": "53",
-                        "__FLT32X_MAX_10_EXP__": "308",
-                        "__FLT32X_MAX_EXP__": "1024",
-                        "__FLT32X_MAX__": "1.79769313486231570814527423731704357e+308F32x",
-                        "__FLT32X_MIN_10_EXP__": "(-307)",
-                        "__FLT32X_MIN_EXP__": "(-1021)",
-                        "__FLT32X_MIN__": "2.22507385850720138309023271733240406e-308F32x",
-                        "__FLT32_DECIMAL_DIG__": "9",
-                        "__FLT32_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F32",
-                        "__FLT32_DIG__": "6",
-                        "__FLT32_EPSILON__": "1.19209289550781250000000000000000000e-7F32",
-                        "__FLT32_HAS_DENORM__": "1",
-                        "__FLT32_HAS_INFINITY__": "1",
-                        "__FLT32_HAS_QUIET_NAN__": "1",
-                        "__FLT32_MANT_DIG__": "24",
-                        "__FLT32_MAX_10_EXP__": "38",
-                        "__FLT32_MAX_EXP__": "128",
-                        "__FLT32_MAX__": "3.40282346638528859811704183484516925e+38F32",
-                        "__FLT32_MIN_10_EXP__": "(-37)",
-                        "__FLT32_MIN_EXP__": "(-125)",
-                        "__FLT32_MIN__": "1.17549435082228750796873653722224568e-38F32",
-                        "__FLT64X_DECIMAL_DIG__": "21",
-                        "__FLT64X_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951F64x",
-                        "__FLT64X_DIG__": "18",
-                        "__FLT64X_EPSILON__": "1.08420217248550443400745280086994171e-19F64x",
-                        "__FLT64X_HAS_DENORM__": "1",
-                        "__FLT64X_HAS_INFINITY__": "1",
-                        "__FLT64X_HAS_QUIET_NAN__": "1",
-                        "__FLT64X_MANT_DIG__": "64",
-                        "__FLT64X_MAX_10_EXP__": "4932",
-                        "__FLT64X_MAX_EXP__": "16384",
-                        "__FLT64X_MAX__": "1.18973149535723176502126385303097021e+4932F64x",
-                        "__FLT64X_MIN_10_EXP__": "(-4931)",
-                        "__FLT64X_MIN_EXP__": "(-16381)",
-                        "__FLT64X_MIN__": "3.36210314311209350626267781732175260e-4932F64x",
-                        "__FLT64_DECIMAL_DIG__": "17",
-                        "__FLT64_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F64",
-                        "__FLT64_DIG__": "15",
-                        "__FLT64_EPSILON__": "2.22044604925031308084726333618164062e-16F64",
-                        "__FLT64_HAS_DENORM__": "1",
-                        "__FLT64_HAS_INFINITY__": "1",
-                        "__FLT64_HAS_QUIET_NAN__": "1",
-                        "__FLT64_MANT_DIG__": "53",
-                        "__FLT64_MAX_10_EXP__": "308",
-                        "__FLT64_MAX_EXP__": "1024",
-                        "__FLT64_MAX__": "1.79769313486231570814527423731704357e+308F64",
-                        "__FLT64_MIN_10_EXP__": "(-307)",
-                        "__FLT64_MIN_EXP__": "(-1021)",
-                        "__FLT64_MIN__": "2.22507385850720138309023271733240406e-308F64",
-                        "__FLT_DECIMAL_DIG__": "9",
-                        "__FLT_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F",
-                        "__FLT_DIG__": "6",
-                        "__FLT_EPSILON__": "1.19209289550781250000000000000000000e-7F",
-                        "__FLT_EVAL_METHOD_TS_18661_3__": "0",
-                        "__FLT_EVAL_METHOD__": "0",
-                        "__FLT_HAS_DENORM__": "1",
-                        "__FLT_HAS_INFINITY__": "1",
-                        "__FLT_HAS_QUIET_NAN__": "1",
-                        "__FLT_MANT_DIG__": "24",
-                        "__FLT_MAX_10_EXP__": "38",
-                        "__FLT_MAX_EXP__": "128",
-                        "__FLT_MAX__": "3.40282346638528859811704183484516925e+38F",
-                        "__FLT_MIN_10_EXP__": "(-37)",
-                        "__FLT_MIN_EXP__": "(-125)",
-                        "__FLT_MIN__": "1.17549435082228750796873653722224568e-38F",
-                        "__FLT_RADIX__": "2",
-                        "__FXSR__": "1",
-                        "__GCC_ASM_FLAG_OUTPUTS__": "1",
-                        "__GCC_ATOMIC_BOOL_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR16_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR32_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_INT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LLONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_POINTER_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_SHORT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL": "1",
-                        "__GCC_ATOMIC_WCHAR_T_LOCK_FREE": "2",
-                        "__GCC_HAVE_DWARF2_CFI_ASM": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8": "1",
-                        "__GCC_IEC_559": "2",
-                        "__GCC_IEC_559_COMPLEX": "2",
-                        "__GLIBCXX_BITSIZE_INT_N_0": "128",
-                        "__GLIBCXX_TYPE_INT_N_0": "__int128",
-                        "__GXX_ABI_VERSION": "1013",
-                        "__GXX_WEAK__": "1",
-                        "__HAVE_SPECULATION_SAFE_VALUE": "1",
-                        "__INT16_C(c)": "c",
-                        "__INT16_MAX__": "0x7fff",
-                        "__INT16_TYPE__": "short int",
-                        "__INT32_C(c)": "c",
-                        "__INT32_MAX__": "0x7fffffff",
-                        "__INT32_TYPE__": "int",
-                        "__INT64_C(c)": "c ## L",
-                        "__INT64_MAX__": "0x7fffffffffffffffL",
-                        "__INT64_TYPE__": "long int",
-                        "__INT8_C(c)": "c",
-                        "__INT8_MAX__": "0x7f",
-                        "__INT8_TYPE__": "signed char",
-                        "__INTMAX_C(c)": "c ## L",
-                        "__INTMAX_MAX__": "0x7fffffffffffffffL",
-                        "__INTMAX_TYPE__": "long int",
-                        "__INTMAX_WIDTH__": "64",
-                        "__INTPTR_MAX__": "0x7fffffffffffffffL",
-                        "__INTPTR_TYPE__": "long int",
-                        "__INTPTR_WIDTH__": "64",
-                        "__INT_FAST16_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST16_TYPE__": "long int",
-                        "__INT_FAST16_WIDTH__": "64",
-                        "__INT_FAST32_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST32_TYPE__": "long int",
-                        "__INT_FAST32_WIDTH__": "64",
-                        "__INT_FAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST64_TYPE__": "long int",
-                        "__INT_FAST64_WIDTH__": "64",
-                        "__INT_FAST8_MAX__": "0x7f",
-                        "__INT_FAST8_TYPE__": "signed char",
-                        "__INT_FAST8_WIDTH__": "8",
-                        "__INT_LEAST16_MAX__": "0x7fff",
-                        "__INT_LEAST16_TYPE__": "short int",
-                        "__INT_LEAST16_WIDTH__": "16",
-                        "__INT_LEAST32_MAX__": "0x7fffffff",
-                        "__INT_LEAST32_TYPE__": "int",
-                        "__INT_LEAST32_WIDTH__": "32",
-                        "__INT_LEAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_LEAST64_TYPE__": "long int",
-                        "__INT_LEAST64_WIDTH__": "64",
-                        "__INT_LEAST8_MAX__": "0x7f",
-                        "__INT_LEAST8_TYPE__": "signed char",
-                        "__INT_LEAST8_WIDTH__": "8",
-                        "__INT_MAX__": "0x7fffffff",
-                        "__INT_WIDTH__": "32",
-                        "__LDBL_DECIMAL_DIG__": "21",
-                        "__LDBL_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951L",
-                        "__LDBL_DIG__": "18",
-                        "__LDBL_EPSILON__": "1.08420217248550443400745280086994171e-19L",
-                        "__LDBL_HAS_DENORM__": "1",
-                        "__LDBL_HAS_INFINITY__": "1",
-                        "__LDBL_HAS_QUIET_NAN__": "1",
-                        "__LDBL_MANT_DIG__": "64",
-                        "__LDBL_MAX_10_EXP__": "4932",
-                        "__LDBL_MAX_EXP__": "16384",
-                        "__LDBL_MAX__": "1.18973149535723176502126385303097021e+4932L",
-                        "__LDBL_MIN_10_EXP__": "(-4931)",
-                        "__LDBL_MIN_EXP__": "(-16381)",
-                        "__LDBL_MIN__": "3.36210314311209350626267781732175260e-4932L",
-                        "__LONG_LONG_MAX__": "0x7fffffffffffffffLL",
-                        "__LONG_LONG_WIDTH__": "64",
-                        "__LONG_MAX__": "0x7fffffffffffffffL",
-                        "__LONG_WIDTH__": "64",
-                        "__LP64__": "1",
-                        "__MMX__": "1",
-                        "__NO_INLINE__": "1",
-                        "__ORDER_BIG_ENDIAN__": "4321",
-                        "__ORDER_LITTLE_ENDIAN__": "1234",
-                        "__ORDER_PDP_ENDIAN__": "3412",
-                        "__PRAGMA_REDEFINE_EXTNAME": "1",
-                        "__PTRDIFF_MAX__": "0x7fffffffffffffffL",
-                        "__PTRDIFF_TYPE__": "long int",
-                        "__PTRDIFF_WIDTH__": "64",
-                        "__REGISTER_PREFIX__": "",
-                        "__SCHAR_MAX__": "0x7f",
-                        "__SCHAR_WIDTH__": "8",
-                        "__SEG_FS": "1",
-                        "__SEG_GS": "1",
-                        "__SHRT_MAX__": "0x7fff",
-                        "__SHRT_WIDTH__": "16",
-                        "__SIG_ATOMIC_MAX__": "0x7fffffff",
-                        "__SIG_ATOMIC_MIN__": "(-__SIG_ATOMIC_MAX__ - 1)",
-                        "__SIG_ATOMIC_TYPE__": "int",
-                        "__SIG_ATOMIC_WIDTH__": "32",
-                        "__SIZEOF_DOUBLE__": "8",
-                        "__SIZEOF_FLOAT128__": "16",
-                        "__SIZEOF_FLOAT80__": "16",
-                        "__SIZEOF_FLOAT__": "4",
-                        "__SIZEOF_INT128__": "16",
-                        "__SIZEOF_INT__": "4",
-                        "__SIZEOF_LONG_DOUBLE__": "16",
-                        "__SIZEOF_LONG_LONG__": "8",
-                        "__SIZEOF_LONG__": "8",
-                        "__SIZEOF_POINTER__": "8",
-                        "__SIZEOF_PTRDIFF_T__": "8",
-                        "__SIZEOF_SHORT__": "2",
-                        "__SIZEOF_SIZE_T__": "8",
-                        "__SIZEOF_WCHAR_T__": "4",
-                        "__SIZEOF_WINT_T__": "4",
-                        "__SIZE_MAX__": "0xffffffffffffffffUL",
-                        "__SIZE_TYPE__": "long unsigned int",
-                        "__SIZE_WIDTH__": "64",
-                        "__SSE2_MATH__": "1",
-                        "__SSE2__": "1",
-                        "__SSE_MATH__": "1",
-                        "__SSE__": "1",
-                        "__STDC_HOSTED__": "1",
-                        "__STDC_IEC_559_COMPLEX__": "1",
-                        "__STDC_IEC_559__": "1",
-                        "__STDC_ISO_10646__": "201706L",
-                        "__STDC_UTF_16__": "1",
-                        "__STDC_UTF_32__": "1",
-                        "__UINT16_C(c)": "c",
-                        "__UINT16_MAX__": "0xffff",
-                        "__UINT16_TYPE__": "short unsigned int",
-                        "__UINT32_C(c)": "c ## U",
-                        "__UINT32_MAX__": "0xffffffffU",
-                        "__UINT32_TYPE__": "unsigned int",
-                        "__UINT64_C(c)": "c ## UL",
-                        "__UINT64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT64_TYPE__": "long unsigned int",
-                        "__UINT8_C(c)": "c",
-                        "__UINT8_MAX__": "0xff",
-                        "__UINT8_TYPE__": "unsigned char",
-                        "__UINTMAX_C(c)": "c ## UL",
-                        "__UINTMAX_MAX__": "0xffffffffffffffffUL",
-                        "__UINTMAX_TYPE__": "long unsigned int",
-                        "__UINTPTR_MAX__": "0xffffffffffffffffUL",
-                        "__UINTPTR_TYPE__": "long unsigned int",
-                        "__UINT_FAST16_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST16_TYPE__": "long unsigned int",
-                        "__UINT_FAST32_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST32_TYPE__": "long unsigned int",
-                        "__UINT_FAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST64_TYPE__": "long unsigned int",
-                        "__UINT_FAST8_MAX__": "0xff",
-                        "__UINT_FAST8_TYPE__": "unsigned char",
-                        "__UINT_LEAST16_MAX__": "0xffff",
-                        "__UINT_LEAST16_TYPE__": "short unsigned int",
-                        "__UINT_LEAST32_MAX__": "0xffffffffU",
-                        "__UINT_LEAST32_TYPE__": "unsigned int",
-                        "__UINT_LEAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_LEAST64_TYPE__": "long unsigned int",
-                        "__UINT_LEAST8_MAX__": "0xff",
-                        "__UINT_LEAST8_TYPE__": "unsigned char",
-                        "__USER_LABEL_PREFIX__": "",
-                        "__WCHAR_MAX__": "0x7fffffff",
-                        "__WCHAR_MIN__": "(-__WCHAR_MAX__ - 1)",
-                        "__WCHAR_TYPE__": "int",
-                        "__WCHAR_WIDTH__": "32",
-                        "__WINT_MAX__": "0xffffffffU",
-                        "__WINT_MIN__": "0U",
-                        "__WINT_TYPE__": "unsigned int",
-                        "__WINT_WIDTH__": "32",
-                        "__amd64": "1",
-                        "__amd64__": "1",
-                        "__code_model_small__": "1",
-                        "__gnu_linux__": "1",
-                        "__k8": "1",
-                        "__k8__": "1",
-                        "__linux": "1",
-                        "__linux__": "1",
-                        "__unix": "1",
-                        "__unix__": "1",
-                        "__x86_64": "1",
-                        "__x86_64__": "1",
-                        "linux": "1",
-                        "unix": "1"
-                    },
-                    "sys_include_envvar": null,
-                    "sys_include_path": [
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0/x86_64-pc-linux-gnu",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0/backward",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include",
-                        "/usr/local/include",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed",
-                        "/usr/include/x86_64-linux-gnu",
-                        "/usr/include"
-                    ]
-                }
-            },
-            "language_cxx.command.#": "/usr/bin/g++",
-            "language_cxx.info.#": "Using built-in specs.\nCOLLECT_GCC=/usr/bin/g++\nCOLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/x86_64-pc-linux-gnu/9.3.0/lto-wrapper\nTarget: x86_64-pc-linux-gnu\nConfigured with: /tmp/gcc-9.3.0/configure --disable-bootstrap --enable-languages=c,c++,lto --prefix=/usr/local --program-suffix=-9.3\nThread model: posix\ngcc version 9.3.0 (GCC) \n",
-            "linker": {
-                "library_path": [
-                    "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/",
-                    "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../lib64/",
-                    "/lib/x86_64-linux-gnu/",
-                    "/lib/../lib64/",
-                    "/usr/lib/x86_64-linux-gnu/",
-                    "/usr/lib/../lib64/",
-                    "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../",
-                    "/lib/",
-                    "/usr/lib/"
-                ]
-            },
-            "types": {
-                "char16_t_type": "unsigned short",
-                "char32_t_type": "unsigned int",
-                "char_bits": 8,
-                "double_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "float_type": {
-                    "alignof": 4,
-                    "sizeof": 4
-                },
-                "int_type": {
-                    "alignof": 4,
-                    "sizeof": 4
-                },
-                "long_double_type": {
-                    "alignof": 16,
-                    "sizeof": 16
-                },
-                "long_long_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "long_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "pointer_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "ptrdiff_t_type": "signed long",
-                "short_type": {
-                    "alignof": 2,
-                    "sizeof": 2
-                },
-                "size_t_type": "unsigned long",
-                "wchar_t_type": "signed int",
-                "wint_t_type": "unsigned int"
-            }
-        }
-    },
-    "_Format": "1.0",
-    "_Version": "7.5.0",
-    "_VersionNum": [
-        7,
-        5,
-        0,
-        11376
-    ]
-}
-

coin/provisioning/common/linux/axivion/post_processing.py

@@ -1,34 +0,0 @@
-#Copyright (C) 2024 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
-
-import re
-
-import axivion.config
-from axivion.analysis.post_processing import FilterAction
-from bauhaus import ir
-
-analysis = axivion.config.get_analysis()
-
-qt_inline_pattern = re.compile(r"QT_.*_INLINE(_IMPL)?_SINCE\(\d+,\d+\)")
-def exclude_inlined_by_qt_inline_macro(sv, ir_graph):
-    node = ir_graph.get_node(ir.Physical, sv.primary_sloc.pir_node_number)
-
-    # we have to check on the token stream as the macro might expand to nothing
-    # -> only the invocation is in the IR, but not in the AST of the routine decl / def
-    preceeding_string = ""
-
-    token = node.Token
-    while True:
-        try:
-            token_value = re.sub('^#\\s+', '#', token.Value)
-            if token_value in {';', '{', '}', '#define'}:
-                break
-            preceeding_string = token.Value + preceeding_string
-            token = token.prev()
-        except StopIteration:
-            break
-    if re.match(qt_inline_pattern, preceeding_string):
-        return FilterAction.exclude
-    return FilterAction.normal
-
-analysis['Qt-Generic-NoFunctionDefinitionInHeader'].post_processing.add_filter(exclude_inlined_by_qt_inline_macro, inputs=[ir.Graph])

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

@@ -1,210 +0,0 @@
-{
-    "Analysis": {
-        "CloneDetection": {
-            "_active": true,
-            "excludes": [
-                "$(splitpath:EXCLUDE_FILES)"
-            ]
-        },
-        "Frameworks-QtSupport": {
-            "_active": true,
-            "exclude_qt_generated_files": true,
-            "qtdir": "/home/qt/work/install"
-        },
-        "Qt-AutoUnexpectedQStringbuilder": {
-            "_active": true
-        },
-        "Qt-BaseClassEvent": {
-            "_active": true
-        },
-        "Qt-ChildEventQObjectCast": {
-            "_active": true
-        },
-        "Qt-Connect3argLambda": {
-            "_active": true
-        },
-        "Qt-ConnectByName": {
-            "_active": true
-        },
-        "Qt-ConnectNonSignal": {
-            "_active": true
-        },
-        "Qt-ConstSignalOrSlot": {
-            "_active": true
-        },
-        "Qt-CtorMissingParentArgument": {
-            "_active": true
-        },
-        "Qt-DetachingTemporary": {
-            "_active": true
-        },
-        "Qt-FullyQualifiedMocTypes": {
-            "_active": true
-        },
-        "Qt-FunctionArgsByValueRef": {
-            "_active": true
-        },
-        "Qt-Generic-DuplicateIncludeGuard": {
-            "_active": true
-        },
-        "Qt-Generic-FormatSpecifier": {
-            "_active": true
-        },
-        "Qt-Generic-InitializeAllFieldsInConstructor": {
-            "_active": true
-        },
-        "Qt-Generic-MissingBaseCopy": {
-            "_active": true
-        },
-        "Qt-Generic-MissingIncludeGuard": {
-            "_active": true
-        },
-        "Qt-Generic-NoAbsoluteInclude": {
-            "_active": true
-        },
-        "Qt-Generic-NoFunctionDefinitionInHeader": {
-            "_active": true
-        },
-        "Qt-Generic-NoIrregularInclude": {
-            "_active": true
-        },
-        "Qt-Generic-NoMixOfClassStruct": {
-            "_active": true
-        },
-        "Qt-Generic-NoOverloadedOperators": {
-            "_active": true
-        },
-        "Qt-Generic-NoReferenceToLocalVariable": {
-            "_active": true
-        },
-        "Qt-Generic-QNetworkReplyDeleteLater": {
-            "_active": true
-        },
-        "Qt-Generic-ThrowByValueCatchByReference": {
-            "_active": true
-        },
-        "Qt-Generic-TypedefCheck": {
-            "_active": true
-        },
-        "Qt-Generic-WrongIncludeCasing": {
-            "_active": true
-        },
-        "Qt-GlobalConstCharPointer": {
-            "_active": true
-        },
-        "Qt-IncorrectEmit": {
-            "_active": true
-        },
-        "Qt-InstallEventFilter": {
-            "_active": true
-        },
-        "Qt-LambdaInConnect": {
-            "_active": true
-        },
-        "Qt-LambdaUniqueConnection": {
-            "_active": true
-        },
-        "Qt-LowercaseQmlTypeName": {
-            "_active": true
-        },
-        "Qt-MissingQObjectMacro": {
-            "_active": true
-        },
-        "Qt-MutableContainerKey": {
-            "_active": true
-        },
-        "Qt-NonPodGlobalStatic": {
-            "_active": true
-        },
-        "Qt-OldStyleConnect": {
-            "_active": true
-        },
-        "Qt-OverloadedSignal": {
-            "_active": true
-        },
-        "Qt-OverriddenSignal": {
-            "_active": true
-        },
-        "Qt-PostEvent": {
-            "_active": true
-        },
-        "Qt-QDateTimeUTC": {
-            "_active": true
-        },
-        "Qt-QEnums": {
-            "_active": true
-        },
-        "Qt-QLatin1StringNonAscii": {
-            "_active": true
-        },
-        "Qt-QMapWithPointerKey": {
-            "_active": true
-        },
-        "Qt-QPropertyWithoutNotify": {
-            "_active": true
-        },
-        "Qt-QStringArg": {
-            "_active": true
-        },
-        "Qt-QStringComparisonToImplicitChar": {
-            "_active": true
-        },
-        "Qt-QhashNamespace": {
-            "_active": true
-        },
-        "Qt-QtMacros": {
-            "_active": true
-        },
-        "Qt-RangeLoopDetach": {
-            "_active": false
-        },
-        "Qt-RangeLoopReference": {
-            "_active": true
-        },
-        "Qt-ReturningDataFromTemporary": {
-            "_active": true
-        },
-        "Qt-RuleOfThree": {
-            "_active": true
-        },
-        "Qt-RuleOfTwoSoft": {
-            "_active": true
-        },
-        "Qt-SkippedBaseMethod": {
-            "_active": true
-        },
-        "Qt-StrictIterators": {
-            "_active": true
-        },
-        "Qt-TemporaryIterator": {
-            "_active": true
-        },
-        "Qt-UnusedNonTrivialVariable": {
-            "_active": true
-        },
-        "Qt-VirtualSignal": {
-            "_active": true
-        },
-        "Qt-WritingToTemporary": {
-            "_active": true
-        },
-        "Qt-WrongQEventCast": {
-            "_active": true
-        },
-        "Qt-WrongQGlobalStatic": {
-            "_active": true
-        },
-        "Stylechecks": {
-            "excludes": [
-                "$(splitpath:EXCLUDE_FILES)"
-            ]
-        }
-    },
-    "_Format": "1.0",
-    "_VersionNum": [
-        7,
-        8,
-        0,
-        15004
-    ]
-}

coin/provisioning/common/linux/axivion/start_analysis.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-#Copyright (C) 2024 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
-
-$HOME/bauhaus-suite/setup.sh --non-interactive
-export PATH=/home/qt/bauhaus-suite/bin:$PATH
-export BAUHAUS_CONFIG=$(cd $(dirname $(readlink -f $0)) && pwd)
-export AXIVION_VERSION_NAME=$(git rev-parse HEAD)
-export EXCLUDE_FILES="build/*:src/3rdparty/*"
-export MODULE=$TESTED_MODULE_COIN
-export PACKAGE="Add-ons"
-export IRNAME=build/$TESTED_MODULE_COIN.ir
-axivion_ci "$@"

coin/provisioning/common/macos/install-simulator-runtime.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 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
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-set -ex
-
-function InstallSimulatorRuntime {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    packageName=$4
-    version=$5
-
-    DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
-    echo "Installing"
-    # macOS 14 / Xcode 15 has a different install command
-    if [[ $OSTYPE == "darwin23" ]]; then
-        xcrun simctl runtime add "/tmp/$packageName"
-    else
-        xcodebuild -importPlatform "/tmp/$packageName"
-    fi
-
-    echo "Simulator Runtime = $version" >> ~/versions.txt
-}

coin/provisioning/common/macos/java_arm.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
+# 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
 
 # This script installs JDK
@@ -8,10 +8,10 @@ set -ex
 
 echo "Installing Java Development Kit"
 
-targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
 
 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK
-cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
+cd /Volumes/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target /
 
 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
+sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force
 
 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
 
-echo "JDK Version = 17.0.13" >> ~/versions.txt
+echo "JDK Version = 15.0.2" >> ~/versions.txt

coin/provisioning/common/unix/install-ffmpeg-android.sh

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.1"
+version="n7.0.2"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 

coin/provisioning/common/unix/install-ffmpeg-ios.sh

@@ -10,66 +10,67 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.1"
+version="n7.0.2"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
 target_dir="$HOME"
 ffmpeg_source_dir="$target_dir/$ffmpeg_name"
 prefix="/usr/local/ios/ffmpeg"
+dylib_regex="^@rpath/.*\.dylib$"
 
 if [ ! -d "$ffmpeg_source_dir" ];
 then
-   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir"
+    InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir"
 fi
 
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
 
 build_ffmpeg_ios() {
-  local target_arch=$1
+    local target_arch=$1
 
-  if [ "$target_arch" == "x86_64" ]; then
+    if [ "$target_arch" == "x86_64" ]; then
-     target_sdk="iphonesimulator"
+        target_sdk="iphonesimulator"
-     target_arch="x86_64"
+        target_arch="x86_64"
-     minos="-mios-simulator-version-min=13.0"
+        minos="-mios-simulator-version-min=14.0"
-  else
+    else
-     target_sdk="iphoneos"
+        target_sdk="iphoneos"
-     target_arch="arm64"
+        target_arch="arm64"
-     minos="-miphoneos-version-min=13.0"
+        minos="-miphoneos-version-min=14.0"
-  fi
+    fi
 
-  local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
+    local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
-  sudo mkdir -p "$build_dir"
+    sudo mkdir -p "$build_dir"
-  pushd "$build_dir"
+    pushd "$build_dir"
 
-  # shellcheck disable=SC2086
+    # shellcheck disable=SC2086
-  sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
+    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
     --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-  --enable-cross-compile \
+    --enable-cross-compile \
-  --enable-optimizations \
+    --enable-optimizations \
-  --prefix=$prefix \
+    --prefix=$prefix \
-  --arch=$target_arch \
+    --arch=$target_arch \
-  --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
+    --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
-  --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
+    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
-  --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
+    --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
-  --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
+    --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
-  --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
+    --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
-  --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
+    --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
-  --target-os=darwin \
+    --target-os=darwin \
-  --extra-cflags="$minos" \
+    --extra-cflags="$minos" \
-  --extra-cxxflags="$minos" \
+    --extra-cxxflags="$minos" \
-  --enable-cross-compile \
+    --enable-cross-compile \
-  --enable-shared \
+    --enable-shared \
-  --disable-static \
+    --disable-static \
-  --install-name-dir='@rpath/Frameworks' \
+    --install-name-dir='@rpath/Frameworks' \
-  --enable-swscale \
+    --enable-swscale \
-  --enable-pthreads \
+    --enable-pthreads \
-  --disable-audiotoolbox
+    --disable-audiotoolbox
 
-  sudo make install DESTDIR="$build_dir/installed" -j4
+    sudo make install DESTDIR="$build_dir/installed" -j
-  popd
+    popd
 }
 
 install_ffmpeg() {
@@ -94,15 +95,88 @@ install_ffmpeg() {
                 exit 1
             fi
         done
-        echo "LS"
         popd >/dev/null
     done
     sudo cp -r $1$prefix/include $prefix
-    echo "LS done."
+}
+
+build_info_plist() {
+    local file_path="$1"
+    local framework_name="$2"
+    local framework_id="$3"
+
+    local minimum_version_key="MinimumOSVersion"
+    local minimum_os_version="16.0"
+    local supported_platforms="iPhoneOS"
+
+    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${framework_name}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${framework_id}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${framework_name}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
+    <key>CFBundleShortVersionString</key>
+    <string>7.0.2</string>
+    <key>CFBundleVersion</key>
+    <string>7.0.2</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>${minimum_version_key}</key>
+    <string>${minimum_os_version}</string>
+    <key>CFBundleSupportedPlatforms</key>
+    <array>
+        <string>${supported_platforms}</string>
+    </array>
+    <key>NSPrincipalClass</key>
+    <string></string>
+</dict>
+</plist>"
+    echo $info_plist | sudo tee ${file_path} 1>/dev/null
+}
+
+
+create_framework() {
+    local framework_name="$1"
+    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg"
+    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
+
+    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
+    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
+
+    sudo install_name_tool -id @rpath/Frameworks/${framework_name}.framework/${framework_name} "${framework_complete_path}"
+    sudo vtool -set-build-version ios 16.0 -input ${framework_complete_path} -output ${framework_complete_path}
+
+    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
+    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
+        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
+        if [ "$found_name" != "$framework_name" ]
+        then
+            sudo install_name_tool -change "$dependency_path" @rpath/Frameworks/${found_name}.framework/${found_name} "${framework_complete_path}"
+        fi
+    done
+    sudo mkdir -p "$prefix/framework/"
+    sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
 }
 
 build_ffmpeg_ios "x86_64"
 build_ffmpeg_ios "arm64"
 
+ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
+
+for name in $ffmpeg_libs; do
+    create_framework $name
+done
+
 install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
+
 SetEnvVar "FFMPEG_DIR_IOS" $prefix

coin/provisioning/common/unix/install-ffmpeg.sh

@@ -17,9 +17,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.1"
+version="n7.0.2"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 

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

@@ -6,9 +6,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
 
-$version="n7.1"
+$version="n7.0.2"
 $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 $ffmpeg_name="FFmpeg-$version"
 

coin/provisioning/common/windows/version.ps1

@@ -4,6 +4,3 @@ Write-Host '*****************************************************'
 Write-Host '******************** Get-PSDrive ********************'
 Get-PSDrive
 Write-Host '*****************************************************'
-Write-Host '******************** Path Content *******************'
-$env:Path -split ';'
-Write-Host '*****************************************************'

coin/provisioning/common/windows/vulkansdk.ps1

@@ -6,36 +6,13 @@
 # This script will install Vulkan SDK
 # Original Download page: https://vulkan.lunarg.com/sdk/home#windows
 
-$cpu_arch = Get-CpuArchitecture
+$version = "1.2.182.0"
-Write-Host "Installing $cpu_arch Vulkan SDK"
-$version = "1.2.182.0"  # TODO: Update to newest 1.3.296.0
-switch ($cpu_arch) {
-    arm64 {
-        $version = "1.3.296.0"
-        $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/warm/InstallVulkanARM64-$version.exe"
-        $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\InstallVulkanARM64-$version.exe"
-        $sha1 = "7d47d8dd10c09d363e6103925c4a032abf7b2c02"
-        $installArgs = "--accept-licenses --default-answer --confirm-command install"
-        Break
-    }
-    x64 {
-        $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe"
-        $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe"
-        $sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
-        $installArgs = "/S"
-        Break
-    }
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
-}
-
 $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
-
+$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
-Download "$externalUrl" "$internalUrl" "$vulkanPackage"
+Download "https://sdk.lunarg.com/sdk/download/1.2.182.0/windows/VulkanSDK-$version-Installer.exe" "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" $vulkanPackage
 Verify-Checksum "$vulkanPackage" "$sha1"
 
-Run-Executable "$vulkanPackage" "$installArgs"
+Run-Executable $vulkanPackage "/S"
 
 Write-Host "Cleaning $vulkanPackage.."
 Remove "$vulkanPackage"

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

@@ -113,7 +113,7 @@ installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
-installPackages+=(openjdk-17-jdk)
+installPackages+=(openjdk-11-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)

coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh

@@ -42,16 +42,8 @@ installPackages+=(git)
 installPackages+=(p7zip-full)
 
 # Packages needed for RTA and Squish
-installPackages+=(openjdk-17-jdk)
+installPackages+=(default-jdk)
 installPackages+=(gcc)
-installPackages+=(curl)
-installPackages+=(libicu-dev)
-installPackages+=(python3-dev)
-installPackages+=(python3-pip)
-installPackages+=(python3-venv)
-installPackages+=(virtualenv)
-# For mounting ci-files01 for Squish
-installPackages+=(nfs-common)
 
 echo "Running update for apt"
 waitLoop

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh

@@ -1,39 +1,6 @@
 #!/bin/bash
-#Copyright (C) 2024 The Qt Company Ltd
+#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
 
-# This script installs Axivion Bauhaus Suite tool.
+# shellcheck source=../common/linux/axivion-bauhaus-suite.sh
-
+source "${BASH_SOURCE%/*}/../common/linux/axivion-bauhaus-suite.sh"
-set -ex
-
-# shellcheck source=../common/unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-DownloadAndExtract () {
-    url=$1
-    sha=$2
-    file=$3
-
-    DownloadURL "$url" "$url" "$sha" "$file"
-    tar -xzvf "$file"
-
-    rm -rf "$file"
-}
-
-
-# Axivion Bauhaus Suite
-sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
-targetFile="bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
-sha1="43d18d55087ce02009b850553405af55ba4e37e2"
-cd "$HOME"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
-
-mkdir "$HOME/.bauhaus"
-cd "$HOME/.bauhaus"
-wget http://ci-files01-hki.ci.qt.io/input/axivion/QT_11427439_2025-10-07.key
-cd "$HOME"
-
-#Axivion configuration
-cp -r "${BASH_SOURCE%/*}/../common/linux/axivion/"  "$HOME/"
-
-echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh

@@ -146,7 +146,9 @@ installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
-installPackages+=(openjdk-17-jdk)
+installPackages+=(openjdk-8-jdk)
+#Java 11 for Android
+installPackages+=(openjdk-11-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh

@@ -66,9 +66,6 @@ sudo zypper -nq install make
 # Tools to build Git
 sudo zypper -nq install autoconf libcurl-devel libexpat-devel
 
-# Java
-sudo zypper -nq install java-17-openjdk
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh

@@ -72,9 +72,6 @@ sudo zypper -nq install openssl-3
 # Valgrind (Needed for testlib selftests)
 sudo zypper -nq install valgrind-devel
 
-# Java
-sudo zypper -nq install java-17-openjdk
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh

@@ -79,9 +79,6 @@ sudo zypper -nq install valgrind-devel
 # cifs-utils, for mounting smb drive
 sudo zypper -nq install cifs-utils
 
-# Java
-sudo zypper -nq install java-17-openjdk
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 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
-
-set -ex
-
-# shellcheck source=../common/macos/install-simulator-runtime.sh
-source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
-version="17.4"
-packageName=iOS_"$version"_Simulator_Runtime.dmg
-url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
-sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50"
-
-InstallSimulatorRuntime $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 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
-
-set -ex
-
-# shellcheck source=../common/macos/install-simulator-runtime.sh
-source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
-version="17.4"
-packageName=iOS_"$version"_Simulator_Runtime.dmg
-url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
-sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50"
-
-InstallSimulatorRuntime $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 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
-
-set -ex
-
-# shellcheck source=../common/macos/install-simulator-runtime.sh
-source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
-version="18.0"
-packageName=iOS_"$version"_Simulator_Runtime.dmg
-url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
-sha1="f29778313459b3a2a497ffd711b9dfa212241183"
-
-InstallSimulatorRuntime $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 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
-
-set -ex
-
-# shellcheck source=../common/macos/install-simulator-runtime.sh
-source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
-version="18.0"
-packageName=iOS_"$version"_Simulator_Runtime.dmg
-url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
-sha1="f29778313459b3a2a497ffd711b9dfa212241183"
-
-InstallSimulatorRuntime $url $url $sha1 $packageName $version