diff --git a/.gitmodules b/.gitmodules index f8c07ce3887..57d732587d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +1,40 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 6.9.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtimageformats qtshadertools qtsvg qtlanguageserver path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 6.9.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtmultimedia"] depends = qtbase qtshadertools recommends = qtdeclarative qtquick3d path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 6.9.0 status = addon [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 6.9.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +47,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 6.9.0 status = essential priority = 30 [submodule "qtdoc"] @@ -55,7 +55,7 @@ recommends = qtmultimedia qtshadertools qtwebengine path = qtdoc url = ../qtdoc.git - branch = dev + branch = 6.9.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -68,7 +68,7 @@ depends = qtbase path = qtqa url = ../qtqa.git - branch = dev + branch = 6.9.0 status = essential priority = 50 [submodule "qtlocation"] @@ -76,21 +76,21 @@ recommends = qtdeclarative path = qtlocation url = ../qtlocation.git - branch = dev + branch = 6.9.0 status = preview [submodule "qtpositioning"] depends = qtbase recommends = qtdeclarative qtserialport path = qtpositioning url = ../qtpositioning.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -117,61 +117,61 @@ recommends = qtdeclarative path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 6.9.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtshadertools qtmultimedia path = qt3d url = ../qt3d.git - branch = dev + branch = 6.9.0 status = deprecated [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtwebchannel qttools qtpositioning path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 6.9.0 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -185,28 +185,28 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtgamepad"] depends = qtbase @@ -219,27 +219,27 @@ depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtspeech"] depends = qtbase qtmultimedia recommends = qtdeclarative path = qtspeech url = ../qtspeech.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets @@ -252,88 +252,88 @@ depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = 6.9.0 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools recommends = qtquicktimeline path = qtquick3d url = ../qtquick3d.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = dev + branch = 6.9.0 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = dev + branch = 6.9.0 status = deprecated [submodule "qtcoap"] depends = qtbase path = qtcoap url = ../qtcoap.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative recommends = qtwebsockets path = qtmqtt url = ../qtmqtt.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtlanguageserver"] depends = qtbase path = qtlanguageserver url = ../qtlanguageserver.git - branch = dev + branch = 6.9.0 status = preview [submodule "qthttpserver"] depends = qtbase recommends = qtwebsockets path = qthttpserver url = ../qthttpserver.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtquick3dphysics"] depends = qtbase qtdeclarative qtquick3d qtshadertools path = qtquick3dphysics url = ../qtquick3dphysics.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtgrpc"] depends = qtbase recommends = qtdeclarative path = qtgrpc url = ../qtgrpc.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtquickeffectmaker"] depends = qtbase qtdeclarative qtshadertools recommends = qtquick3d path = qtquickeffectmaker url = ../qtquickeffectmaker.git - branch = dev + branch = 6.9.0 status = addon [submodule "qtgraphs"] depends = qtbase qtdeclarative qtquick3d path = qtgraphs url = ../qtgraphs.git - branch = dev + branch = 6.9.0 status = addon diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000000..69388ea438a --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=codereview.qt-project.org +project=qt/qt5 +defaultbranch=dev diff --git a/README.md b/README.md index ccf35c370c0..37f54aff81e 100644 --- a/README.md +++ b/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 2019 or later, or MinGW-builds gcc 11.2 or later) + * Supported compiler (Visual Studio 2022 or later, or MinGW-builds gcc 13.1 or later) * Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store) ``` diff --git a/cmake/QtIRGitHelpers.cmake b/cmake/QtIRGitHelpers.cmake index 288f4ac78fb..d851b65a31e 100644 --- a/cmake/QtIRGitHelpers.cmake +++ b/cmake/QtIRGitHelpers.cmake @@ -93,9 +93,15 @@ 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. -function(qt_ir_add_git_remotes repo_name working_directory) - set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/") +# Add gerrit remotes to the repository located in the working_directory. +# repo_relative_url is the relative URL of the repository. +# Examples: +# - 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) @@ -110,7 +116,10 @@ function(qt_ir_add_git_remotes repo_name working_directory) string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}") endif() - string(APPEND gerrit_repo_url "${repo_name}") + set(namespace "qt") + set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}") + qt_ir_normalize_git_url("http://github.com/$%7Brepo_relative_url_with_namespace%7D%22%20normalized_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}" @@ -193,15 +202,21 @@ 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_has_url_scheme("${submodule_url}" has_url_scheme) + qt_ir_parse_git_url( + 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("http://github.com/$%7Bsubmodule_url%7D%22%20submodule_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("http://github.com/$%7Bmirror%7D%22%20mirror) endif() set(mirror_or_original_url "${submodule_url}") diff --git a/cmake/QtIRParsingHelpers.cmake b/cmake/QtIRParsingHelpers.cmake index d7d3f20e9d3..04a344234f5 100644 --- a/cmake/QtIRParsingHelpers.cmake +++ b/cmake/QtIRParsingHelpers.cmake @@ -40,18 +40,79 @@ function(qt_ir_get_git_config_contents out_var) set(${out_var} "${git_output}" PARENT_SCOPE) endfunction() -# Checks whether the given url has a scheme like https:// or is just a -# relative path. -function(qt_ir_has_url_scheme url out_var) - string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}") +# Parses a git repo url to: +# - check if the given url has a scheme like https:// or git:// or is just a +# relative path with no scheme (possibly containing '../' segments) +# - extracts the scheme if it exists +# - 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}) - if(has_url_scheme) - set(${out_var} TRUE PARENT_SCOPE) + 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(${out_var} FALSE PARENT_SCOPE) + 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}") + endif() + + set(${out_var} "${normalized_url}" PARENT_SCOPE) +endfunction() + # Parses a key-value line from a .git/config or .gitmodules file macro(qt_ir_parse_git_key_value) string(REGEX REPLACE "^submodule\\.([^.=]+)\\.([^.=]+)=(.*)$" "\\1;\\2;\\3" @@ -79,14 +140,22 @@ endmacro() # url_value # the url where to clone a repo from # in perl script it was called $base -# e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git' +# Examples: +# - '../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 -# e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git' +# Examples: +# - 'qt5' +# - 'tqtc-qt5' +# - 'qtdeclarative.git' +# - 'qttools.git' +# - 'https://code.qt.io/playground/qlitehtml.git' # # Outputs # @@ -94,21 +163,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 all the ../ are collapsed -# e.g. 'qtdeclarative.git' -# 'https://code.qt.io/playground/qlitehtml.git', +# ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments +# are collapsed depending on how many path segments are available in +# ${parent_repo_base_git_path}. +# 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_has_url_scheme("${url_value}" has_url_scheme) + qt_ir_parse_git_url( + 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}") - - # 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 "") + qt_ir_normalize_git_url("http://github.com/$%7Bbase_git_path%7D%22%20base_git_path) else() set(base_git_path "${url_value}") endif() diff --git a/coin/instructions/coin_qt_configure.yaml b/coin/instructions/coin_qt_configure.yaml index c165025642c..a8aebd7df56 100644 --- a/coin/instructions/coin_qt_configure.yaml +++ b/coin/instructions/coin_qt_configure.yaml @@ -47,3 +47,20 @@ 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" diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index d42ebfbb838..587e6ce359f 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -1,20 +1,10 @@ Version: 2 Configurations: -- - Id: 'opensuse-15.5-host-asan' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] - Configure arguments: '-nomake examples -developer-build' - Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' - ] - Id: 'opensuse-15.6-host-asan' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer', 'InsignificantTests'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 91f02d252bb..b22e660cc08 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -30,13 +30,13 @@ Configurations: Id: 'ubuntu-22.04-developer-build-x11-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04-developer-build' - Id: 'ubuntu-22.04-x11-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04' # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - @@ -65,7 +65,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['PinCores', 'TestOnly'] + Features: ['TestOnly'] Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'QT_QPA_OFFSCREEN_NO_GLX=1', @@ -99,30 +99,19 @@ Configurations: Id: 'ubuntu-24.04-x64-developer-build-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64-developer-build' - Id: 'ubuntu-24.04-x64-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' -- - Id: 'opensuse-15.5-developer-build' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-nomake examples -developer-build' - Environment variables: [ - 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' - ] - Id: 'opensuse-15.6-developer-build' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', @@ -131,7 +120,7 @@ Configurations: ] - Id: 'sles-15_sp5-static' - Template: 'qtci-linux-SLES-15_SP5-x86_64-50' + Template: 'qtci-linux-SLES-15_SP5-x86_64-51' Compiler: 'GCC' Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' @@ -151,9 +140,9 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2022' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', @@ -163,9 +152,9 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', @@ -175,9 +164,9 @@ Configurations: ] - Id: 'windows-11_22h2-arm64-msvc2022' - Template: 'qtci-windows-11_22H2-aarch64-54' + Template: 'qtci-windows-11_22H2-aarch64-55' Compiler: 'MSVC2022' - Features: ['PinCores', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', @@ -186,7 +175,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022-arm64' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] @@ -202,9 +191,9 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] + Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', @@ -216,7 +205,7 @@ Configurations: Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', '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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', @@ -226,7 +215,7 @@ Configurations: Id: 'rhel-9.4' Template: 'qtci-linux-RHEL-9.4-x86_64-50' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] + 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', @@ -247,9 +236,9 @@ Configurations: ] - Id: 'windows-10_22h2-mingw13' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' - Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -260,9 +249,9 @@ Configurations: ] - Id: 'windows-11_23H2-llvm' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Clang' - Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', @@ -273,9 +262,9 @@ Configurations: ] - Id: 'windows-11_23H2-mingw13-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Mingw' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -310,7 +299,19 @@ Configurations: 'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', ] - +- + Id: 'bookworm-gles-arm64-debian-pkg-packaging' + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant'] + Environment variables: [ + 'DEBIAN_RULES_REF=6.9_gles', + 'COIN_TARGET_DIST=tqtc-bookworm', + 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', + 'COIN_SBUILD_CHROOT=stable-arm64-sbuild', + 'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main', + 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', + ] - # This configuration runs for every submodule, using externally # built qdoc and qattributionscanner binaries, to ensure that no @@ -320,6 +321,6 @@ Configurations: Id: 'documentation-warnings' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2'] + Features: ['Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2'] Platform dependency: 'ubuntu-22.04' diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index dc42483d07c..8e64879aeb0 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples'] + Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', @@ -24,7 +24,7 @@ Configurations: Target arch: 'arm64' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests'] + Features: ['Sccache', 'UseConfigure', 'InsignificantTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index a783cf8eaab..1dc43a8a64d 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -8,13 +8,14 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['PinCores', 'Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin', 'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'QNX_QEMU={{.Env.QNX_710_QEMU}}', ] - Id: 'qnx-710-arm64-on-linux' diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml index 278196f0e3e..5bfe98cd761 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'vxworks-imx6-buildtest' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] Environment variables: [ 'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', @@ -23,7 +23,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'vxworks-x86_64-buildtest' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] Environment variables: [ 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 6bd5f994edb..08d8fe614a3 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -3,7 +3,7 @@ Configurations: - Id: 'windows-11_23H2-msvc2022-minimal-static-test' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests'] Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql' @@ -15,7 +15,7 @@ Configurations: ] - Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test' - Template: 'qtci-windows-11_22H2-aarch64-53' + Template: 'qtci-windows-11_22H2-aarch64-55' 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' @@ -53,9 +53,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql' Environment variables: [ - 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] - diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index ac5dbd22e12..8053d8c995b 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -2,9 +2,9 @@ Version: 2 Configurations: - Id: 'sles-15_sp5-minimal-static' - Template: 'qtci-linux-SLES-15_SP5-x86_64-50' + Template: 'qtci-linux-SLES-15_SP5-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' @@ -20,9 +20,9 @@ Configurations: ] - Id: 'windows-11_23H2-minimal-static' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', @@ -34,5 +34,5 @@ Configurations: Id: 'macos-minimal-static' Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 32a50fda397..369bd5339c1 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -17,7 +17,7 @@ Configurations: ] - Id: 'android-armv7-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' @@ -39,7 +39,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -47,22 +47,6 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_api_28' ] -- - Id: 'android-14-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=emulator_x86_64_api_34' - ] - Id: 'android-15-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.10-x86_64-51' @@ -71,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 4ee7839ef1d..57d7a4c81df 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -2,36 +2,25 @@ Version: 2 Configurations: - Id: 'webassembly-linux-thread-asyncify' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Sccache', 'DoNotRunTests', 'UseConfigure'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \ - -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"" - ] -- - Id: 'webassembly-linux-thread-asyncify-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Sccache', 'DoNotRunTests', 'UseConfigure'] + Features: ['DoNotRunTests', 'UseConfigure'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \ - -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"" + -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"", + 'HEADLESS_CHROME_FOR_TESTING=true' ] - Id: 'webassembly-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', @@ -41,24 +30,11 @@ Configurations: ] - Id: 'webassembly-linux-thread' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON' - ] -- - Id: 'webassembly-linux-thread-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', @@ -67,24 +43,11 @@ Configurations: ] - Id: 'webassembly-linux-shared' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON' - ] -- - Id: 'webassembly-linux-shared-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared', diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index f05645e95d0..1cfb652f77e 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -2,13 +2,13 @@ Version: 2 Configurations: - Id: "ios-tests-on-macos" - Template: 'qtci-macos-13-x86_64-103' + Template: 'qtci-macos-14-arm-106' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang' ] diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 18af40abaa1..8188a2ba93c 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -10,10 +10,9 @@ Configurations: Platform dependency: [ 'rhel-8.10', 'android-9-x86-on-linux', - 'android-14-x86_64-on-linux' + 'android-15-x86_64-on-linux' ] Features: [ - 'PinCores', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', @@ -23,7 +22,7 @@ Configurations: Environment variables: [ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_28' ] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index ee848796c17..938c7ca9b1b 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -15,9 +15,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ - 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] - @@ -29,7 +28,6 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', ] @@ -119,7 +117,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - Id: 'macos-14-arm64-developer-build' @@ -129,7 +126,6 @@ Configurations: Configure arguments: '-developer-build -nomake examples -debug -framework' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', ] diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index a4e1bed2022..40a53fd36aa 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -7,7 +7,7 @@ Include: [ Configurations: - Id: 'qnx-710-arm64-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index 73bb0b13d51..7743c714936 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'windows-11_23H2-msvc2022-unity-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib' @@ -53,6 +53,5 @@ Configurations: Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON', ] diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 9ffcbaee45f..deabdf009b8 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2019' Features: ['DisableTests'] - diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index c30819a54f3..d1401e71d78 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' @@ -15,7 +15,7 @@ Configurations: Configure arguments: '' Environment variables: [] - - Template: 'qtci-linux-Debian-11.6-aarch64-50' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' @@ -28,7 +28,7 @@ Configurations: Environment variables: [] # without tests - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' @@ -36,7 +36,7 @@ Configurations: Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] # oldest Qt version - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index eea3b14164c..e55ab01f97c 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -15,9 +15,6 @@ Include: [ Configurations: [] Overrides: # Make VxWorks tests insignificant. -- - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml index f38904c857e..80f720d7ca4 100644 --- a/coin/platform_configs/qtcharts.yaml +++ b/coin/platform_configs/qtcharts.yaml @@ -10,7 +10,7 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index f444fd1c5df..d0fe0e60772 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -14,7 +14,7 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtgraphs.yaml b/coin/platform_configs/qtgraphs.yaml index 4f61e54aa13..be582f53341 100644 --- a/coin/platform_configs/qtgraphs.yaml +++ b/coin/platform_configs/qtgraphs.yaml @@ -6,8 +6,3 @@ Include: [ address_sanitizer_platforms.yaml ] Configurations: [] -Overrides: -# Make VxWorks arm tests insignificant. -- - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtgrpc.yaml b/coin/platform_configs/qtgrpc.yaml index e6108d6209d..f2967349845 100644 --- a/coin/platform_configs/qtgrpc.yaml +++ b/coin/platform_configs/qtgrpc.yaml @@ -6,8 +6,3 @@ Include: [ address_sanitizer_platforms.yaml ] Configurations: [] -Overrides: -# Make VxWorks arm tests insignificant. -- - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 086990d78cd..ff56d2d5f15 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -11,4 +11,4 @@ Overrides: # Make VxWorks x86_64 tests insignificant. - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index fac4ba008f5..a055d59bcc5 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -11,4 +11,4 @@ Overrides: # Make VxWorks x86_64 tests insignificant. - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index f33170f1763..3a3e93ff21f 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -8,7 +8,6 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "opensuse-15.5-developer-build", "opensuse-15.6-developer-build", "sles-15_sp5-static", "sles-15_sp6-static", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ed3db97f0c2..d0da81c1ab3 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -8,7 +8,6 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "opensuse-15.5-developer-build", "opensuse-15.6-developer-build", "sles-15_sp5-static", "sles-15_sp6-static", @@ -49,7 +48,7 @@ Configurations: ] - Id: 'Windows-MSVC2022_Static' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' 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' diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index e20587af14a..34b1acbf6c0 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -10,7 +10,7 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 7230a74973e..d63d2c6bb96 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] Features: ['Packaging', UseLegacyInstructions'] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 2d2bfa765ef..ae0d1bf0cf8 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ + "documentation-warnings", "rhel-8.10", 'windows-10_22h2-mingw13', 'ubuntu-22.04-developer-build', @@ -13,8 +14,9 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-9-x86-on-linux', - 'android-14-x86_64-on-linux' - ] + 'android-15-x86_64-on-linux' + ], + offline_documentation.yaml ] Configurations: - diff --git a/coin/platform_configs/wasm_qtbase_tests.yaml b/coin/platform_configs/wasm_qtbase_tests.yaml index 36c897a79cc..ff2e5001208 100644 --- a/coin/platform_configs/wasm_qtbase_tests.yaml +++ b/coin/platform_configs/wasm_qtbase_tests.yaml @@ -2,15 +2,8 @@ Version: 2 Configurations: - Id: 'webassembly-linux-thread-asyncify-tests' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] - Platform dependency: 'webassembly-linux-thread-asyncify' -- - Id: 'webassembly-linux-thread-asyncify-tests-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'webassembly-linux-thread-asyncify-openSUSE-15.6' + Platform dependency: 'webassembly-linux-thread-asyncify' diff --git a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt index 09764b39602..1953083eb06 100644 --- a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt @@ -56,6 +56,10 @@ Windows 10 SDK (10.0.22000.0) Windows 10 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################ diff --git a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt index 331a2615511..18c4e8882d6 100644 --- a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt @@ -56,6 +56,10 @@ Windows 11 SDK (10.0.22000.0) Windows 11 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################ diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt index a5a0c41284c..2a13096667b 100644 --- a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt @@ -57,6 +57,10 @@ Windows 11 SDK (10.0.22000.0) Windows 11 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################ diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 96b67a17ce2..e5d8148d2b6 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -26,18 +26,13 @@ toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersionLatest="r26b" ndkVersionDefault=$ndkVersionLatest -sdkBuildToolsVersion="34.0.0" -sdkApiLevel="android-34" +sdkBuildToolsVersion="35.0.1" +sdkApiLevel="android-35" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4" ndkSha1Default=$ndkSha1Latest -# Android 14 avd zip -android14SystemZipName="android14system_UE1A_230829_036.tar.gz" -android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5" -android14SystemPath="$basePath/$android14SystemZipName" - # Android Automotive max SDK level image sdkApiLevelAutomotiveMax="android-34" androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" @@ -136,12 +131,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 34.1.19" -emulatorFileName="emulator-linux_x64-11525734.zip" +echo "Download and unzip Android Emulator version 35.2.10" +emulatorFileName="emulator-linux_x64-12414864.zip" emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName" emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName" emulatorTargetFile="$sdkTargetFolder/$emulatorFileName" -emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7" +emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10" DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile" echo "Unzipping the Android Emulator to '$sdkTargetFolder'" sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder" @@ -162,13 +157,20 @@ echo "Unzipping the Android 9 to $minVersionDestination" sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination" rm "$minVersionFilePath" -echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \ - | eval "$sdkmanager_no_progress_bar_cmd" +echo "Download and unzip Android 15 System Image" +maxVersionFileName="x86_64-35_r08.zip" +maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/" +maxVersionFilePath="$maxVersionDestination/$maxVersionFileName" +maxVersionCiUrl="$basePath/system-images/google_apis/$maxVersionFileName" +maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName" +maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b" -echo "Extract stored Android 14 Beta $android14SystemZipName" -DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \ - "/tmp/$android14SystemZipName" -sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images" +mkdir -p "$maxVersionDestination" +DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath" + +echo "Unzipping the Android 15 to $maxVersionDestination" +sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination" +rm "$maxVersionFilePath" echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" @@ -176,9 +178,6 @@ ls -l "$sdkTargetFolder" echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \ -k "system-images;android-28;google_apis;x86" -echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \ - -k "system-images;android-34;google_apis;x86_64" - echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \ -k "system-images;android-35;google_apis;x86_64" diff --git a/coin/provisioning/common/linux/cmake_min_supported.sh b/coin/provisioning/common/linux/cmake_min_supported.sh index 4c64299bb24..7113fe47581 100755 --- a/coin/provisioning/common/linux/cmake_min_supported.sh +++ b/coin/provisioning/common/linux/cmake_min_supported.sh @@ -9,13 +9,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.16" -version="3.16.8" -PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c" +majorminorversion="3.22" +version="3.22.6" +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz" +SHA1="4a5ba17568d108d295719850dd584e775583f61b" targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" +appPrefix="cmake-$version-linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" diff --git a/coin/provisioning/common/linux/configure-gnome-shell.sh b/coin/provisioning/common/linux/configure-gnome-shell.sh new file mode 100755 index 00000000000..ff1f4d655ba --- /dev/null +++ b/coin/provisioning/common/linux/configure-gnome-shell.sh @@ -0,0 +1,17 @@ +#!/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 + +# This script modifies GNOME based Linux configurations + +set -ex + +# Desktop +echo "Disable blank screen power saving (timeout 0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Disable Automatic screen lock when screensaver goes active" +gsettings set org.gnome.desktop.screensaver lock-enabled false +echo "Disable window animations." +gsettings set org.gnome.desktop.interface enable-animations false +echo "Disable hot corner feature" +gsettings set org.gnome.desktop.interface enable-hot-corners false diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index 41d2d103509..874e7b4a932 100755 --- a/coin/provisioning/common/linux/qnx_710.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -26,12 +26,12 @@ DownloadAndExtract () { aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake" -QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/" +QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/710/" targetFolder="/opt/" folderName="qnx710" targetPath="$targetFolder$folderName" -qemuTargetPath="$HOME/QNX" +qemuTargetPath="$HOME/QNX710" qemuIpAddress="172.31.1.10" export qemuNetwork="172.31.1.1" qemuSSHuser="root" @@ -81,7 +81,7 @@ fi # Set env variables SetEnvVar "QNX_710" "$targetPath" -SetEnvVar "QNX_QEMU" "$qemuTargetPath" +SetEnvVar "QNX_710_QEMU" "$qemuTargetPath" SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress" SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl" SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath" diff --git a/coin/provisioning/common/linux/qnx_800.sh b/coin/provisioning/common/linux/qnx_800.sh index 52545d416ae..77730602a62 100755 --- a/coin/provisioning/common/linux/qnx_800.sh +++ b/coin/provisioning/common/linux/qnx_800.sh @@ -26,12 +26,12 @@ DownloadAndExtract () { aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake" -QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/" +QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/800/" targetFolder="/opt/" folderName="qnx800" targetPath="$targetFolder$folderName" -qemuTargetPath="$HOME/QNX" +qemuTargetPath="$HOME/QNX800" qemuIpAddress="172.31.1.10" export qemuNetwork="172.31.1.1" qemuSSHuser="root" @@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then fi # QNX SDP -sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-linux-20240510.tar.xz" +sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20240930.tar.xz" targetFile="qnx800.tar.xz" -sha1="93245a5bc11b88563328f0763573942fd25b5e18" +sha1="a86d6e001e4ad46f50ed430fb85e8230e730751b" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" sudo cp "$aarch64le_toolchain" "$targetPath" @@ -81,5 +81,11 @@ fi # Set env variables SetEnvVar "QNX_800" "$targetPath" +SetEnvVar "QNX_800_QEMU" "$qemuTargetPath" +# These are common defines with QNX710 +SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress" +SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl" +SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath" + echo "QNX SDP = 8.0.0" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/hosts b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/hosts similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/hosts rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/hosts diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/resolv.conf b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/resolv.conf similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/resolv.conf rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/resolv.conf diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/opt_scripts/opt_nfs_qt similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/opt_scripts/opt_nfs_qt diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/options b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/options similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/options rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/options diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_env.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_env.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/passwd_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/passwd_file.builtin similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/passwd_file.builtin rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/passwd_file.builtin diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/shadow_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/shadow_file.builtin similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/shadow_file.builtin rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/shadow_file.builtin diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/uids.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/uids.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/uids.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/uids.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts new file mode 100644 index 00000000000..58b8d5a131d --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts @@ -0,0 +1,19 @@ +# Need to add all testserver names statically +# as current Docker uses Multicast DNS (mDNS) (avahi) +# Which does not work with QNX qemu +172.31.1.1 apache2 apache2.test-net.qt.local +172.31.1.1 squid squid.test-net.qt.local +172.31.1.1 vsftpd vsftpd.test-net.qt.local +172.31.1.1 ftp-proxy ftp-proxy.test-net.qt.local +172.31.1.1 danted danted.test-net.qt.local +172.31.1.1 cyrus cyrus.test-net.qt.local +172.31.1.1 echo echo.test-net.qt.local +172.31.1.1 iptables iptables.test-net.qt.local + +# For network test server which is still used on some test +# like networkselftest for local dns resolution +172.31.1.1 qt-test-server + +# QtCoap testservers +172.31.1.1 californium californium.test-net.qt.local +172.31.1.1 freecoap freecoap.test-net.qt.local diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf new file mode 100644 index 00000000000..6765c11f7c6 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf @@ -0,0 +1,2 @@ +search test-net.qt.local +nameserver 172.31.1.1 diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt new file mode 100755 index 00000000000..13db322b852 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt @@ -0,0 +1,46 @@ +#!/bin/bash + +function brief() +{ + echo "--nfs=[|no]" +} + +function help() +{ + brief + cat <" will be mounted at + + The default is no. +EOF +} + +function validate() { + exit 0 +} + +function configure() +{ + if [ "$OPT_NFS_QT" != no ]; then + cat >output/option_files/post_start.opt_nfs < Starting NFS" +STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT +EOF + fi + + exit 0 +} + +case "$1" in + brief) + brief;; + help) + help;; + validate) + validate;; + configure) + configure;; + default) + echo no;; +esac diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options new file mode 100644 index 00000000000..bf1a413eb22 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options @@ -0,0 +1,88 @@ +OPT_ABLELOCK='no' +DEF_OPT_ABLELOCK='no' +OPT_ARCH='x86_64' +DEF_OPT_ARCH='x86_64' +OPT_ASLR='yes' +DEF_OPT_ASLR='yes' +OPT_CERTICOM='no' +DEF_OPT_CERTICOM='no' +OPT_CRYPTODEV='no' +DEF_OPT_CRYPTODEV='no' +OPT_DATA_INODES='3000' +DEF_OPT_DATA_INODES='3000' +OPT_DATA_SIZE='512' +DEF_OPT_DATA_SIZE='60' +OPT_EXTRA_DIRS='none' +DEF_OPT_EXTRA_DIRS='none' +OPT_GRAPHICS='no' +DEF_OPT_GRAPHICS='no' +OPT_GUEST='none' +DEF_OPT_GUEST='none' +OPT_HOSTNAME='qnx_QEMU_CI' +DEF_OPT_HOSTNAME='noname' +OPT_IP='172.31.1.69' +DEF_OPT_IP='dhcp' +OPT_MACADDR='52:54:00:f1:c4:92' +DEF_OPT_MACADDR='generate' +OPT_NFS='no' +DEF_OPT_NFS='no' +OPT_NFS_QT='/home/qt/work' +DEF_OPT_NFS_QT='/home/qt/work' +OPT_PATHTRUST='no' +DEF_OPT_PATHTRUST='no' +OPT_PERL='no' +DEF_OPT_PERL='no' +OPT_POLICY='none' +DEF_OPT_POLICY='none' +OPT_PYTHON='no' +DEF_OPT_PYTHON='no' +OPT_QAUDIT='no' +DEF_OPT_QAUDIT='no' +OPT_QFIM='no' +DEF_OPT_QFIM='no' +OPT_QTD='no' +DEF_OPT_QTD='no' +OPT_QVM='no' +DEF_OPT_QVM='no' +OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET' +DEF_OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET' +OPT_ROOT='no' +DEF_OPT_ROOT='no' +OPT_SAFE='no' +DEF_OPT_SAFE='no' +OPT_SECPOL='no' +DEF_OPT_SECPOL='no' +OPT_SECURE_DATA='no' +DEF_OPT_SECURE_DATA='no' +OPT_SECURE_PROCFS='yes' +DEF_OPT_SECURE_PROCFS='yes' +OPT_SLM='no' +DEF_OPT_SLM='no' +OPT_SSHD_PREGEN='yes' +DEF_OPT_SSHD_PREGEN='yes' +OPT_SSH_IDENT='prompt' +DEF_OPT_SSH_IDENT='prompt' +OPT_SYS_INODES='1000' +DEF_OPT_SYS_INODES='1000' +OPT_SYS_SIZE='20' +DEF_OPT_SYS_SIZE='20' +OPT_TCG='no' +DEF_OPT_TCG='no' +OPT_TELNET='no' +DEF_OPT_TELNET='no' +OPT_TOMCRYPT='no' +DEF_OPT_TOMCRYPT='no' +OPT_TOYBOX='no' +DEF_OPT_TOYBOX='no' +OPT_TYPE='qemu' +DEF_OPT_TYPE='qemu' +OPT_TZ='UTC0' +DEF_OPT_TZ='UTC0' +OPT_UNION='yes' +DEF_OPT_UNION='yes' +OPT_USB='no' +DEF_OPT_USB='no' +OPT_VALGRIND='no' +DEF_OPT_VALGRIND='no' +OPT_ZONEINFO='no' +DEF_OPT_ZONEINFO='no' diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom new file mode 100644 index 00000000000..cba74f1f812 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom @@ -0,0 +1,25 @@ +# local/snippets/data_files.custom +# Placeholder for local list of files to add to data partition + +home/root/.ssh/environment = { +TERM=qansi +PATH=__IFS_PATH__:/system/xbin:. +#LD_LIBRARY_PATH=__PROC_LIB__:/home/qt/work/install/target/lib +#QSG_RHI_BACKEND=software +#QT_QPA_PLATFORM=offscreen +} + +[uid=0 gid=0 dperms=755 type=dir] var/share +var/share/zoneinfo=usr/share/zoneinfo + +[uid=0 gid=0 dperms=755 type=dir] var/share/fonts +var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf +var/share/fonts=usr/share/fonts + +var/etc/hosts=local/misc_files/etc/hosts +var/etc/resolv.conf=local/misc_files/etc/resolv.conf +var/etc/nsswitch.conf=etc/nsswitch.conf + +[uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs +var/share/ca-certificates=local/misc_files/ca-certificates +var/etc/ssl/certs=local/misc_files/etc/ssl/certs diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom new file mode 100644 index 00000000000..0ae7a4dc0f3 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom @@ -0,0 +1,12 @@ +# Add root HOME env variable +procmgr_symlink /data/home/root/ /home/root +HOME=/home/root + +# Needed for timezone related tests +TZ=Europe/Oslo +procmgr_symlink /data/var/share /usr/share +procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime + +# fontconfig +#procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf +#procmgr_symlink /data/var/share/fonts /usr/share/fonts diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin new file mode 100644 index 00000000000..142fd04ebe2 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin @@ -0,0 +1,3 @@ +root:x:0:0:Superuser:/data/home/root:/bin/sh +sshd:x:15:6:sshd:/data/var/chroot/sshd:/bin/false +qnxuser:x:__QNXUSER_UID__:__QNXUSER_GID__:User9:/data/home/qnxuser:/bin/sh diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom new file mode 100644 index 00000000000..4c0a65527f4 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom @@ -0,0 +1,29 @@ +# local/snippets/post_start.custom +# Commands executed from post_startup.sh. Executed at the end of system startup whether slm is in use +# or not +# +# To allow resource managers to be run properly with and without security policies, command lines +# should be written in one of the following forms: +# +# START(resmgr_t) resmgr DROPROOT(resmgr_uid) +# STARTU(resmgr_t, resmgr_uid) resmgr +# Where resmgr_t is the security type name (arbitrary but usually the name of the resmgr with _t appended), +# and resmgr_uid is the id to use for both uid and gid. DROPROOT is used only in cases where the +# resource manager supports a -U option for switching to non-root. +echo "---> Starting Filesystem event manager (fsevmgr)" +STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__ + +echo "---> Remove large fonts" +rm -rf /data/var/share/fonts/NotoSansCJK* +rm -rf /data/var/share/fonts/NotoSansMonoCJK* +echo "---> Create fontconfig cache" +fc-cache & + +echo "---> Restart ssh daemon" +slay sshd +/system/xbin/sshd -f /system/data/etc/ssh/sshd_config + +# Add default route so QNX knows where to send +# requests for unknown network +echo "---> Add default route" +route add default 172.31.1.1 diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin new file mode 100644 index 00000000000..e362b971492 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin @@ -0,0 +1,2 @@ +root::1475759054:0:0 +qnxuser:@S@f0J4xZibUbKllVqPMzetauCHLRi+9C8wTsxYXE5r7Pfhda5FI7zkObEmKogy01pAX5f/1niG2S2eLXbLs3xoww==@YjBmOTQwNzZiNzYwMzY3N2RkMGQ1NTZmNzA5MDFhMWY=:1476890273:0:0 diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom new file mode 100644 index 00000000000..b7e8e28078e --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom @@ -0,0 +1,65 @@ +# local/snippets/system_files.custom +# Placeholder for local list of files to add to system partition + +[perms=444] data/etc/ssh/sshd_config={ +HostKey /data/var/ssh/ssh_host_rsa_key +HostKey /data/var/ssh/ssh_host_ed25519_key +AuthorizedKeysFile .ssh/authorized_keys +PermitUserEnvironment yes +AuthenticationMethods none +PermitEmptyPasswords yes +PermitRootLogin yes +PidFile none +Subsystem sftp /system/xbin/sftp-server +} + +# libraries Qt requires +lib/libicuuc.so.67=usr/lib/libicuuc.so.67 +lib/libicudata.so.67=usr/lib/libicudata.so.67 +lib/libicui18n.so.67=usr/lib/libicui18n.so.67 +lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1 +lib/libEGL.so.1=usr/lib/libEGL.so.1 +lib/libz.so.2=usr/lib/libz.so.2 +lib/libzstd.so.1=usr/lib/libzstd.so.1 +lib/libxml2.so.2=usr/lib/libxml2.so.2 +lib/libfreetype.so.24=usr/lib/libfreetype.so.24 +lib/libbz2.so.1=usr/lib/libbz2.so.1 +lib/liblzma.so.5=usr/lib/liblzma.so.5 +lib/libdbus-1.so=usr/lib//libdbus-1.so +lib/libdbus-1.so.22=usr/lib//libdbus-1.so.22 +lib/libbacktrace.so.1=lib/libbacktrace.so.1 +lib/libm.so.3=lib/libm.so.3 + +############################################# +### Image support +############################################# +etc/system/config/img.conf=etc/system/config/img.conf +lib/libpng16.so.16=usr/lib/libpng16.so.16 +lib/libjpeg.so.9=lib/libjpeg.so.9 +lib/libimg.so.1=lib/libimg.so.1 +lib/dll/img_codec_bmp.so=lib/dll/img_codec_bmp.so +lib/dll/img_codec_gif.so=lib/dll/img_codec_gif.so +lib/dll/img_codec_jpg.so=lib/dll/img_codec_jpg.so +lib/dll/img_codec_png.so=lib/dll/img_codec_png.so +lib/dll/img_codec_sgi.so=lib/dll/img_codec_sgi.so +lib/dll/img_codec_tga.so=lib/dll/img_codec_tga.so +lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so + +# for inotify +xbin/fsevmgr=sbin/fsevmgr + +############################################## +### Sreen support +############################################## +lib/libscreen.so.1=usr/lib/libscreen.so.1 + +# for fontconfig +lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1 +xbin/fc-cache=bin/fc-cache +xbin/fc-match=local/misc_files/fc-match + +# network +lib/libssl.so=usr/lib/libssl.so +xbin/nslookup=usr/bin/nslookup +xbin/unbound=sbin/unbound +xbin/curl=usr/bin/curl diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom new file mode 100644 index 00000000000..9787971c024 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom @@ -0,0 +1 @@ +#define __FSEVMG_ID__ 50 diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index b7dc953f8f3..8eaa8dc199a 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersionLatest="r26b" ndkVersionDefault="$ndkVersionLatest" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/macos/install-simulator-runtime.sh b/coin/provisioning/common/macos/install-simulator-runtime.sh new file mode 100755 index 00000000000..b3d6981339e --- /dev/null +++ b/coin/provisioning/common/macos/install-simulator-runtime.sh @@ -0,0 +1,25 @@ +#!/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 +} diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 059758c8a22..e33ce98ce03 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2018 The Qt Company Ltd. +# Copyright (C) 2025 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # Install libiodbc @@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@" -# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc - read -r -a arr <<< "$(brew list --versions libiodbc)" version=${arr[1]} -SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}" -SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}" +SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)" echo "libiodbc = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/postgresql.sh b/coin/provisioning/common/macos/postgresql.sh index 8980d28eccf..e146b018fec 100755 --- a/coin/provisioning/common/macos/postgresql.sh +++ b/coin/provisioning/common/macos/postgresql.sh @@ -37,5 +37,5 @@ umount "$mountpoint" echo "Removing $packageName" rm "/tmp/$packageName" -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin" +SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/$psqlVersion" echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index b85105b5594..cd689708568 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -8,21 +8,21 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -version="3.1.56" +version="3.1.70" versionNode="v16.20.0" tarBallVersion="${version//./_}" -if uname -a |grep -q Darwin; then +if uname -a | grep -q Darwin; then tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz" - sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84" + sha="eafd7b96ab12d84183d2eaa62e8d39bb12c252bf" else tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz" - sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5" + sha="047a3da9048edc71fb56af544c4bb2448d6c0644" fi cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/$%7BtarBallPackage%7D" target="/tmp/${tarBallPackage}" mkdir -p /opt -cd /opt +cd /opt || exit echo "URL: $cacheUrl" if DownloadURL "$cacheUrl" "" "$sha" "$target"; then @@ -31,13 +31,16 @@ if DownloadURL "$cacheUrl" "" "$sha" "$target"; then else echo "Emsdk isn't cached. Cloning it" sudo git clone https://github.com/emscripten-core/emsdk.git - cd emsdk - sudo ./emsdk install "$version" + cd emsdk || exit + if ! sudo ./emsdk install "$version"; then + echo "Error: emsdk installation failed" + exit 1 + fi sudo ./emsdk activate "$version" fi # platform-specific toolchain and node binaries. urls obtained from "emsdk install" -if uname -a |grep -q Darwin; then +if uname -a | grep -q Darwin; then pathNodeExecutable="node-$versionNode-darwin-x64/bin/node" else pathNodeExecutable="node-$versionNode-linux-x64/bin/node" diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 9eab75d88ed..66feaf2ee89 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/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.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 21e4d7d8013..dbcc6c4bfa5 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -10,15 +10,16 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" 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 @@ -28,48 +29,49 @@ fi ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") build_ffmpeg_ios() { - local target_arch=$1 - - if [ "$target_arch" == "x86_64" ]; then - target_sdk="iphonesimulator" - target_arch="x86_64" - minos="-mios-simulator-version-min=13.0" - else - target_sdk="iphoneos" - target_arch="arm64" - minos="-miphoneos-version-min=13.0" - fi - - local build_dir="$ffmpeg_source_dir/build_ios/$target_arch" - sudo mkdir -p "$build_dir" - pushd "$build_dir" - - # shellcheck disable=SC2086 - sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \ + local target_platform=$1 + if [ "$target_platform" == "arm64-simulator" ]; then + target_sdk="iphonesimulator" + target_platform="arm64" + minos="-mios-simulator-version-min=16.0" + else + target_sdk="iphoneos" + target_platform="arm64" + minos="-miphoneos-version-min=16.0" + # TODO: consider non-arm simulator? + fi + + # Note: unlike similar install-ffmpeg scripts, not $target_platform, + # but $1 (which can be arm64-simulator with arm64 target_platform). + local build_dir="$ffmpeg_source_dir/build_ios/$1" + sudo mkdir -p "$build_dir" + pushd "$build_dir" + + # shellcheck disable=SC2086 + sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \ --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \ - --enable-cross-compile \ - --enable-optimizations \ - --prefix=$prefix \ - --arch=$target_arch \ - --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \ - --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \ - --ar="$(xcrun --sdk ${target_sdk} --find ar)" \ - --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \ - --strip="$(xcrun --sdk ${target_sdk} --find strip)" \ - --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ - --target-os=darwin \ - --extra-cflags="$minos" \ - --extra-cxxflags="$minos" \ - --enable-cross-compile \ - --enable-shared \ - --disable-static \ - --install-name-dir='@rpath/Frameworks' \ - --enable-swscale \ - --enable-pthreads \ - --disable-audiotoolbox - - sudo make install DESTDIR="$build_dir/installed" -j - popd + --enable-cross-compile \ + --enable-optimizations \ + --prefix=$prefix \ + --arch=$target_platform \ + --cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \ + --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \ + --ar="$(xcrun --sdk ${target_sdk} --find ar)" \ + --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \ + --strip="$(xcrun --sdk ${target_sdk} --find strip)" \ + --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ + --target-os=darwin \ + --extra-ldflags="$minos" \ + --enable-cross-compile \ + --enable-shared \ + --disable-static \ + --install-name-dir='@rpath' \ + --enable-swscale \ + --enable-pthreads \ + --disable-audiotoolbox + + sudo make install DESTDIR="$build_dir/installed" -j4 + popd } install_ffmpeg() { @@ -98,11 +100,106 @@ install_ffmpeg() { popd >/dev/null done sudo cp -r $1$prefix/include $prefix - echo "LS done." } -build_ffmpeg_ios "x86_64" +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=" + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${framework_name} + CFBundleIdentifier + ${framework_id} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${framework_name} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 7.0.2 + CFBundleVersion + 7.0.2 + CFBundleSignature + ???? + ${minimum_version_key} + ${minimum_os_version} + CFBundleSupportedPlatforms + + ${supported_platforms} + + NSPrincipalClass + + +" + echo $info_plist | sudo tee ${file_path} 1>/dev/null +} + +create_framework() { + # Create a 'traditional' framework from the corresponding dylib. + local framework_name="$1" + local platform="$2" # For now it's either arm64 or arm64-simulator, see below. + local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/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}" + + # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib + sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}" + + build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name} + + # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above: + 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/${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/" +} + +create_xcframework() { + # Create 'traditional' framework from the corresponding dylib, + # also creating + local framework_name="$1" + + local fw1="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" + local fw2="$ffmpeg_source_dir/build_ios/arm64-simulator/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" + + sudo mkdir -p "$prefix/framework/" + sudo xcodebuild -create-xcframework -framework $fw1 -framework $fw2 -output "${prefix}/framework/${framework_name}.xcframework" +} + +build_ffmpeg_ios "arm64-simulator" build_ffmpeg_ios "arm64" -install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed" +ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale" + +for name in $ffmpeg_libs; do + create_framework $name "arm64" + create_framework $name "arm64-simulator" +done + +# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks: +for name in $ffmpeg_libs; do + create_xcframework $name +done + +install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed" + SetEnvVar "FFMPEG_DIR_IOS" $prefix diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 6d20f9d5ce6..43e5820af03 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/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.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 110d8b9c4b6..bf3a6d90f03 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -92,6 +92,8 @@ cmake "$targetDir" -G"Ninja Multi-Config" \ ninja all:all sudo env "PATH=$PATH" ninja install:all +SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf" + # Refresh shared library cache if OS isn't macOS if uname -a |grep -qv "Darwin"; then sudo ldconfig diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 5f9dc48b0c8..1741cda3aea 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -11,8 +11,8 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="8.0.0" -qtBranch="67x" +version="8.1.0" +qtBranch="68x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable" @@ -24,14 +24,14 @@ testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squi testSuiteLocal="/tmp/squish_test_suite" if uname -a |grep -q Darwin; then compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz" - sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a" + sha1="03a0c713d0d328667df2e7804f2e4d507707b849" else if [ "$PROVISIONING_ARCH" = arm64 ] ; then compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz" - sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5" + sha1="f6a2eb69faed64f13b164fb8d056182c41d2952c" else compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz" - sha1="db5c48f359b46a460551cdf9362c63f557cbc04f" + sha1="b798417ddf4b668306cb90d551df906828644152" fi fi diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index b594238c9f5..418c39312a7 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip" $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-34" -$sdkBuildToolsVersion = "34.0.0" +$sdkApiLevel = "android-35" +$sdkBuildToolsVersion = "35.0.1" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208" diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index b0870e8d04e..5d8db6dfb39 100644 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -5,14 +5,15 @@ # This script will install emscripten needed by WebAssembly -$version = "3.1.56" +$version = "3.1.70" $zipVersion = $version -replace '\.', "_" $temp = "$env:tmp" $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_$%7BzipVersion%7D.zip" -$sha = "ab376d218f1a66302c36770977948f74f0576a42" +$sha = "4d05e378575cb3d74e2740b121730ba1f5822f27" -# Make sure python is in the path -Prepend-Path "C:\Python27" +# Python used for '.\emsdk install' +$pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine") +Prepend-Path $pythonPath cd "C:\\Utils" $installLocationEmsdk = "C:\\Utils\\emsdk" @@ -24,11 +25,18 @@ try { cd $installLocationEmsdk .\emsdk activate $version } catch { - Write-Host "Can't find cached emsdk. Cloning it" + Write-Host "Can't find cached emsdk or another error occurred. Cloning it" + Write-Host "Error details: $_" + C:\PROGRA~1\Git\bin\git clone https://github.com/emscripten-core/emsdk.git cd $installLocationEmsdk - .\emsdk install $version - .\emsdk activate $version + + try { + .\emsdk install $version + .\emsdk activate $version + } catch { + throw "emsdk installation failed: $_" + } } $versionWinPython = $($Env:EMSDK_PYTHON -split ('python\\') -split ('_64bit'))[1] diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index f2c36417878..e960b076c94 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/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.0.2" +$version="n7.1" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +$sha1="f008a93710a7577e3f85a90f4b632cc615164712" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/windows/install-sevenzip.ps1 b/coin/provisioning/common/windows/install-sevenzip.ps1 index 47a34e2be9d..dad34d90b42 100644 --- a/coin/provisioning/common/windows/install-sevenzip.ps1 +++ b/coin/provisioning/common/windows/install-sevenzip.ps1 @@ -5,24 +5,24 @@ # This script installs 7-Zip -$version = "23.01" -$nonDottedVersion = "2301" +$version = "24.09" +$nonDottedVersion = "2409" $cpu_arch = Get-CpuArchitecture switch ($cpu_arch) { arm64 { $arch = "-arm64" - $sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7" + $sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429" Break } x64 { $arch = "-x64" - $sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB" + $sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0" Break } x86 { $arch = "" - $sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C" + $sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497" Break } default { diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 4766d2e964b..38532a34ece 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -6,8 +6,8 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "8.0.0" -$qtBranch = "67x" +$version = "8.1.0" +$qtBranch = "68x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable" @@ -33,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro # In Windows 11 case $OSVersion is 'Windows 10 Pro' $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "0f863c261f854ec38032815298f5636e99779bff" + $sha1 = "e7497b925b9a0aa17628344dbdacd6b3acd41c3b" } } else { $winVersion = "n/a" diff --git a/coin/provisioning/common/windows/version.ps1 b/coin/provisioning/common/windows/version.ps1 index 7f701f637de..127393fd6be 100644 --- a/coin/provisioning/common/windows/version.ps1 +++ b/coin/provisioning/common/windows/version.ps1 @@ -4,3 +4,6 @@ Write-Host '*****************************************************' Write-Host '******************** Get-PSDrive ********************' Get-PSDrive Write-Host '*****************************************************' +Write-Host '******************** Path Content *******************' +$env:Path -split ';' +Write-Host '*****************************************************' diff --git a/coin/provisioning/common/windows/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1 index aeeff69669f..57fd63a1987 100644 --- a/coin/provisioning/common/windows/vulkansdk.ps1 +++ b/coin/provisioning/common/windows/vulkansdk.ps1 @@ -6,13 +6,36 @@ # This script will install Vulkan SDK # Original Download page: https://vulkan.lunarg.com/sdk/home#windows -$version = "1.2.182.0" +$cpu_arch = Get-CpuArchitecture +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 "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 + +Download "$externalUrl" "$internalUrl" "$vulkanPackage" Verify-Checksum "$vulkanPackage" "$sha1" -Run-Executable $vulkanPackage "/S" +Run-Executable "$vulkanPackage" "$installArgs" Write-Host "Cleaning $vulkanPackage.." Remove "$vulkanPackage" diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh deleted file mode 100644 index f803ccc1fa1..00000000000 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd -#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh index 1645670e613..4f9e20dc9c3 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh @@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -20,10 +18,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 42b62022d91..82ba2b41485 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -86,7 +86,6 @@ installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) -installPackages+=(python3-html5lib) installPackages+=(libatomic) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) # For Android builds @@ -154,6 +153,8 @@ installPackages+=(zip) installPackages+=(perl-IPC-Cmd) # password management support for Qt Creator installPackages+=(libsecret-devel) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(perl-JSON) sudo yum -y install "${installPackages[@]}" @@ -167,7 +168,7 @@ sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/py sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel -sudo python3.11 -m pip install virtualenv wheel +sudo python3.11 -m pip install virtualenv wheel html5lib sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" # For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the # system python3.11. @@ -175,6 +176,9 @@ sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requi sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh index b39fe793556..46c10f9e0fb 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh @@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -19,10 +17,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index 4abf653f53a..0c2422c31e1 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -140,5 +140,8 @@ sudo pip3 install virtualenv wheel sudo /usr/bin/pip3 install wheel +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh index 46b321dda8e..bd7a63504b9 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh @@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -19,10 +17,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index 7057c9f8a92..e24d44d0db2 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -152,5 +152,8 @@ sudo python3.8 -m pip install virtualenv wheel sudo /usr/bin/pip3 install wheel +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh index 1645670e613..4f9e20dc9c3 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh @@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -20,10 +18,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index de8b2017fa6..b0d30e444bf 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -162,5 +162,8 @@ sudo python3.8 -m pip install virtualenv wheel sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh index 1645670e613..4f9e20dc9c3 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh @@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -20,10 +18,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 14dec198219..ab8903714a7 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -177,6 +177,9 @@ sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses # No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh index de6abd0a977..41171ca2b82 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh @@ -17,16 +17,11 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 -# Disable hot corner feature -gsettings set org.gnome.desktop.interface enable-hot-corners false -# Disable windows key from showing the GNOME Shell Activities overlay + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 77837171dec..1859acd8426 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -166,5 +166,8 @@ sudo /usr/bin/pip3 install wheel # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh index 4fd0b9e71eb..128d6afb4e8 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh @@ -17,16 +17,11 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 -# Disable hot corner feature -gsettings set org.gnome.desktop.interface enable-hot-corners false -# Disable windows key from showing the GNOME Shell Activities overlay + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 8b1739632c2..32410d861dd 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -198,6 +198,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh index 4fd0b9e71eb..128d6afb4e8 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh @@ -17,16 +17,11 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 -# Disable hot corner feature -gsettings set org.gnome.desktop.interface enable-hot-corners false -# Disable windows key from showing the GNOME Shell Activities overlay + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index 8b1739632c2..c346dbf4c81 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -167,6 +167,8 @@ installPackages+=(perl-IPC-Cmd) installPackages+=(libsecret-devel) # For Firebird in RTA installPackages+=(libtommath-devel) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(perl-JSON) sudo yum -y install "${installPackages[@]}" @@ -198,6 +200,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh index 834843897dc..6fd3c07752d 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh @@ -12,13 +12,8 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh index a9fab9bd669..5c492e5f581 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh @@ -99,5 +99,5 @@ sudo zypper -nq install nodejs16 # OpenSSL 3 sudo zypper -nq install openssl-3 -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh index 4ecddc9d87c..4fb3c37d34e 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh @@ -12,13 +12,8 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index e94a883903c..c6d687a8ca1 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -110,7 +110,10 @@ sudo zypper -nq install cifs-utils # For Firebird in RTA sudo zypper -nq install libtommath-devel -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +# For tst_license.pl with all the machines generating SBOM +sudo zypper -nq install perl-JSON + +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh index bec34ae3987..096cdeb6829 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh @@ -14,13 +14,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" +gsettings set org.gnome.mutter overlay-key "" + +# Disable windows key from showing the GNOME Shell Activities overlay +gsettings set org.gnome.mutter overlay-key "" sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh index 4a5e6e2b01e..2a6bfda6753 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh @@ -113,7 +113,10 @@ sudo zypper -nq install cifs-utils # For Firebird in RTA sudo zypper -nq install libtommath-devel -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +# For tst_license.pl with all the machines generating SBOM +sudo zypper -nq install perl-JSON + +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh index ecad2f9eef4..8751074cc40 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh index 8395b22ae05..56c4c1a5b0c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh @@ -63,6 +63,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 92128c1db6d..e4dade0d5b3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -242,6 +242,8 @@ installPackages+=(patchelf) # For Firebird in RTA installPackages+=(libtommath-dev) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(libjson-perl) echo "Running update for apt" waitLoop @@ -263,5 +265,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh index ba9e8fbf954..6a0c4127858 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh @@ -22,18 +22,18 @@ DownloadAndExtract () { # Axivion Bauhaus Suite -sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz" -targetFile="bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz" -sha1="519f84237a4f55700dfb34767ba5bb342f142012" +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_Evaluation_QSR_INTERN_20250118.key +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.8.4" >> ~/versions.txt +echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh index f0288905a2b..fdbfe546e9b 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,12 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" +gsettings set org.gnome.mutter overlay-key "" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index a87a6e37b11..5f318010b47 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -260,5 +260,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh index f0288905a2b..fdbfe546e9b 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,12 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" +gsettings set org.gnome.mutter overlay-key "" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index de40cfeed37..be9d3e0417f 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -271,5 +271,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh index 1108ba0276d..a2194e2d396 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh @@ -15,11 +15,11 @@ sudo btrfs quota disable / sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index 25bea45b298..3d82dade54c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -69,7 +69,7 @@ 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)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh index d60ccd7f420..61f68eb95a8 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh @@ -15,11 +15,11 @@ sudo btrfs quota disable / sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh index 5ee179e33e6..eab1d584ae1 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh @@ -75,7 +75,7 @@ sudo zypper -nq install valgrind-devel # Java sudo zypper -nq install java-17-openjdk -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh index 01c8a0483c2..da2900c0167 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh @@ -14,11 +14,11 @@ sudo btrfs quota disable / sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index 10c0d7de98a..69f3b420d6e 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -91,7 +91,7 @@ sudo zypper -nq install libtommath-devel # Java sudo zypper -nq install java-17-openjdk -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh index 5891a40c222..e5eb34804d3 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh @@ -19,8 +19,8 @@ sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlock sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index dd722e4ebc5..c2a9641dcf2 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -87,7 +87,10 @@ sudo zypper -nq install libtommath-devel # Java sudo zypper -nq install java-17-openjdk -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +# For tst_license.pl with all the machines generating SBOM +sudo zypper -nq install perl-JSON + +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh index ba54c2c5a7b..7901ea1a468 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh @@ -10,14 +10,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -chromeVersion="chrome-for-testing-115" -sha="7242ece1055bdbf503527f8e87c4b5da37c3c60e" -chromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/$%7BchromeVersion%7D.tar.gz" -target="/tmp/chrome-for-testing-115.tar.gz" +chromeVersion="chrome-for-testing-131" +sha="006d8e0438980d5ca8809af6f036e2b802b13cc8" +cachedChromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/$%7BchromeVersion%7D.zip" +officialChromeUrl="https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.204/linux64/chrome-linux64.zip" +target="/tmp/${chromeVersion}.zip" -DownloadURL "$chromeUrl" "" "$sha" "$target" -sudo tar -xzf "$target" -C "${HOME}" +DownloadURL "$cachedChromeUrl" "$officialChromeUrl" "$sha" "$target" +sudo unzip -q "$target" -d "${HOME}" sudo rm -f "$target" - -SetEnvVar "BROWSER_FOR_WASM" "${HOME}/${chromeVersion}/chrome" -SetEnvVar "CHROMEDRIVER_PATH" "${HOME}/${chromeVersion}/chromedriver" +chromePath="${HOME}/chrome-linux64/chrome" +SetEnvVar "BROWSER_FOR_WASM" "${chromePath}" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh index 95460b553ba..2c1e4b8faf0 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh @@ -22,5 +22,5 @@ appPrefix="" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" +SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/9.6" echo "PostgreSQL = $psqlVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh index 3ae2cbf6cbf..8381d489122 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11-arm/30-android.sh b/coin/provisioning/qtci-macos-11-arm/30-android.sh index 3ae2cbf6cbf..8381d489122 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh index 11bcf7ad809..10b44e0b617 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index 6259b71ed12..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index 6259b71ed12..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..69e3a52d13b --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/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 diff --git a/coin/provisioning/qtci-macos-14-arm/30-android.sh b/coin/provisioning/qtci-macos-14-arm/30-android.sh index 6259b71ed12..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..69e3a52d13b --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/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 diff --git a/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh b/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh index cb7c0774d94..b66bbc38afa 100755 --- a/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh +++ b/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh @@ -5,3 +5,8 @@ set -ex defaults write com.apple.CrashReporter DialogType server + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false" diff --git a/coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..470bae9011b --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/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 diff --git a/coin/provisioning/qtci-macos-15-arm/30-android.sh b/coin/provisioning/qtci-macos-15-arm/30-android.sh index 6259b71ed12..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-15-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-15-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh index cb7c0774d94..b66bbc38afa 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh @@ -5,3 +5,8 @@ set -ex defaults write com.apple.CrashReporter DialogType server + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false" diff --git a/coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..470bae9011b --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/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 diff --git a/qt3d b/qt3d index 219dd44a26c..817da71237a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 219dd44a26cf4323c1a3ba1c7a48ac5f1596b5ba +Subproject commit 817da71237ad5dbd330cfa0f4bef6453f0b3b2ca diff --git a/qt5compat b/qt5compat index 9e0fc26d8e0..fc6136cd56d 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 9e0fc26d8e087379ef3f860460c066274368c012 +Subproject commit fc6136cd56dff94f1b361daa455c89b1e7a9f5a6 diff --git a/qtactiveqt b/qtactiveqt index bea80dcdbc1..956cb49031e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bea80dcdbc1ca1580f7214debf0790415fba9bc2 +Subproject commit 956cb49031eda680033770737a608d4d7b175576 diff --git a/qtbase b/qtbase index 9cb0d48aae8..25986746947 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9cb0d48aae81c5436bda783b64721d0b77bc3f6c +Subproject commit 25986746947798e1a22d0830d3bcb11a55fcd3ae diff --git a/qtcharts b/qtcharts index f4aa9dffcfe..b70ae640035 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f4aa9dffcfed508f1e7fb7a0f95cb0873ecd47c7 +Subproject commit b70ae640035d7cfcf7831cb1ae4b03d654f512a1 diff --git a/qtcoap b/qtcoap index 24c6d918810..ca0a28ab51a 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 24c6d9188107d0834b44b91517f58656a495d495 +Subproject commit ca0a28ab51aa0edbc7b933f0bb90e5ace18e26e4 diff --git a/qtconnectivity b/qtconnectivity index d401180fc4b..ece3a0985bf 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d401180fc4bc59a4dbe279cd4cdf3f4325d6e210 +Subproject commit ece3a0985bfb5decc20237859c03d58e446d555b diff --git a/qtdatavis3d b/qtdatavis3d index 3e7d0a477a0..26d79075db7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3e7d0a477a0fe97e8de7669b8d4460c8280c2887 +Subproject commit 26d79075db7ac12b2b1133a5a0b92bc9213dfb61 diff --git a/qtdeclarative b/qtdeclarative index f5673f1e0e1..47ecb4fa226 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5673f1e0e139fab33a456275b015fe4e5ca3986 +Subproject commit 47ecb4fa226253c1ac85be8130ba905f95318f36 diff --git a/qtdoc b/qtdoc index 7d49bbdf128..0bda6f9e022 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7d49bbdf12829df94719f5a53de9f20f76b7502b +Subproject commit 0bda6f9e0229610bbe5473da90e5e507ee7309e3 diff --git a/qtgraphs b/qtgraphs index 59085abc657..ba29aa033b1 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 59085abc6574fdfd222bc9e9b0473093e5344360 +Subproject commit ba29aa033b1878429dd1f12d783c57e516f6f32a diff --git a/qtgrpc b/qtgrpc index bfd24967bc2..4b2cd4aa03a 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit bfd24967bc26373f4920e3505cd3d4fd28e70687 +Subproject commit 4b2cd4aa03a6e17b0dce6c3e01877da5e302f0a4 diff --git a/qthttpserver b/qthttpserver index 45c60e30e0a..c51fe1d95f6 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 45c60e30e0a4a411162365cf01aafc1b0cba201c +Subproject commit c51fe1d95f664ae2e174d83ac28115b53957faa8 diff --git a/qtimageformats b/qtimageformats index 08d1bb47494..ef67cca6770 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 08d1bb474949c2d4f886928198bcf4cbf70ce724 +Subproject commit ef67cca677009a0fee91bac184d80fc99e4d091f diff --git a/qtlanguageserver b/qtlanguageserver index 5f998f06ebd..d219e5f4333 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 5f998f06ebd2aeedad839eb33b303fb44a10aaa9 +Subproject commit d219e5f4333afba7fc5b83a0175930247d5acf1b diff --git a/qtlocation b/qtlocation index ea636dd72f8..276ffe9b4b7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ea636dd72f823c20c988b05230b7fbf5ea4aca4d +Subproject commit 276ffe9b4b7bd2f72489273c3a2c53ecc5cbde9a diff --git a/qtlottie b/qtlottie index 0fd4a8f813e..7cd6ebe1638 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0fd4a8f813e0a0395de2b4374935fe6023d3afce +Subproject commit 7cd6ebe1638c6dbeed6354fc5348ec87566f093b diff --git a/qtmqtt b/qtmqtt index aeac9f7e171..f3ef845e68f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit aeac9f7e171205bb9c47eb6479cfd3d31768f312 +Subproject commit f3ef845e68fd5887b8518582546137d4635d552a diff --git a/qtmultimedia b/qtmultimedia index f68eef36f23..653ac764f46 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f68eef36f234acfa4e99e1c8ba1d9ed8119a8f44 +Subproject commit 653ac764f4632188df2123e499e8a47364f6addb diff --git a/qtnetworkauth b/qtnetworkauth index 2f263f7028d..26d7973d560 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2f263f7028d2933c5e536c16f5622349053e682d +Subproject commit 26d7973d560c0c3307c7ef895836d95ff79a028c diff --git a/qtopcua b/qtopcua index 7055c65fc10..0904dd6bd99 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 7055c65fc10b2fdec80fe957768bdf27f7874ce1 +Subproject commit 0904dd6bd999f321aa4f4493e5455fe7325167f6 diff --git a/qtpositioning b/qtpositioning index 7db6885dce3..b345591854d 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 7db6885dce399ad7ef47493c612127b71d3b229d +Subproject commit b345591854d8e715ae9dbaac0d2565c74e1225ea diff --git a/qtquick3d b/qtquick3d index 575612ae6be..1a50a5d1a5c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 575612ae6be6811226e794e68009db046d7ad780 +Subproject commit 1a50a5d1a5cd4f07d23490325964a599bfea8dc1 diff --git a/qtquick3dphysics b/qtquick3dphysics index 85f5ad2048d..04949741f24 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 85f5ad2048d5fa11a0d9086cdb6a1dce549b44de +Subproject commit 04949741f24bc3c2d5a3793340c47522140373f5 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index e1847e589af..2db777f18e2 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit e1847e589affcc420c69cbf028f361276aa292a0 +Subproject commit 2db777f18e256e6507f5d5371bdfd37697b8c591 diff --git a/qtquicktimeline b/qtquicktimeline index 9e0a9979f2f..6c2a7848571 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9e0a9979f2fe9eeead3c16311d0e3b8d6d5bbb8d +Subproject commit 6c2a7848571c3ecf20b9c8c673c6e73c7a11ea29 diff --git a/qtremoteobjects b/qtremoteobjects index 392a215a2ad..0985f861806 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 392a215a2ad716b9cc60311da2d8b09af149753e +Subproject commit 0985f8618069965b66d105d2fac106f72e41473b diff --git a/qtrepotools b/qtrepotools index c29a3c2801d..557cbde5d11 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c29a3c2801d99b128ab68aab6a829d96c231d281 +Subproject commit 557cbde5d1130fc9469cee46f21ea84c22237add diff --git a/qtscxml b/qtscxml index 253845885a6..9b99f8e446b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 253845885a6e293f0c4dbbd3d53131afd7b88f9c +Subproject commit 9b99f8e446b49b3f527c3d23fbd3470d9c4e881f diff --git a/qtsensors b/qtsensors index 9a2f543f523..9ed2d79ff2f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9a2f543f523bfe3519c4b7d2c56b03393d21fe88 +Subproject commit 9ed2d79ff2faf5d3c6afa70a97c51653f76f7e54 diff --git a/qtserialbus b/qtserialbus index 19335acb872..e5476371955 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 19335acb87270d0768609b2e6bf708c7deac14ec +Subproject commit e547637195589dea21094d670c675b9793197b73 diff --git a/qtserialport b/qtserialport index 125813ab104..87eaa4a16ca 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 125813ab104a417ea168eeda8842ca1a51a4453e +Subproject commit 87eaa4a16ca21b7110e36b3ce11c287af30b6193 diff --git a/qtshadertools b/qtshadertools index ce3904c1b29..d6b8c38ef5b 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ce3904c1b29b8960b623dee229f7fabdc7d14bd0 +Subproject commit d6b8c38ef5b4ad382bc8bfaf8a9b81e748daba9e diff --git a/qtspeech b/qtspeech index da727c8dcc7..0370bc1fe4d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit da727c8dcc725c0f213e17cf68b2e7616d87ae66 +Subproject commit 0370bc1fe4d4071149149d890dce98b78ef09883 diff --git a/qtsvg b/qtsvg index f4de0d25d1f..0d6c7fd8159 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f4de0d25d1faeb131b5fd6d37bd2ab2cbd27ab47 +Subproject commit 0d6c7fd8159b7307f53403a4eba21848ecb4dc5c diff --git a/qttools b/qttools index 3557f0897aa..087e300bf28 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3557f0897aa2624b633a0bb83f1970245de37e1f +Subproject commit 087e300bf286aaee92682d828ee0bd622e00d52a diff --git a/qttranslations b/qttranslations index 437e02421dd..929f433290b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 437e02421ddfad8ad0480f4ccf20b1abf647acbd +Subproject commit 929f433290b79dfcb88d357fb166b358c32e6a3c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8a59f19d1b0..1dc69c101c8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8a59f19d1b0b56fa3430927e4800d278e8d53746 +Subproject commit 1dc69c101c8eac14a8f4dfc2b7ba41334bf9b4f7 diff --git a/qtwayland b/qtwayland index a8018eced50..9a9a0416e7c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a8018eced508e2afffba4dfb20d04a23a184d7f9 +Subproject commit 9a9a0416e7c8c5a8c6eb59207714af197966cdc5 diff --git a/qtwebchannel b/qtwebchannel index a13deb0fbd2..bd8526ac42e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a13deb0fbd2f0af0c23311b83c3783ab27140a56 +Subproject commit bd8526ac42e195501887e387472db0a90b50dbc1 diff --git a/qtwebengine b/qtwebengine index bee04d31444..444c84a6c36 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bee04d31444c6dc2976beee9ad7d974f83633e41 +Subproject commit 444c84a6c36de4f17d1dbd87710ff5659b71c8bc diff --git a/qtwebsockets b/qtwebsockets index 508323d5093..0707110b34e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 508323d509354719754e12008b70199fe018d62b +Subproject commit 0707110b34e99ae48b61dbd3087f2edfcc940f93 diff --git a/qtwebview b/qtwebview index ac1a751e6f6..93adf4e6785 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ac1a751e6f60748dc2a6bdf54569610fdc432efb +Subproject commit 93adf4e67859fa50f3800985ff96a188a06719ec