diff options
| -rw-r--r-- | cmake/QtBuildHelpers.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtPublicSbomCycloneDXHelpers.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtPublicSbomDocumentNamespaceHelpers.cmake | 456 | ||||
| -rw-r--r-- | cmake/QtPublicSbomHelpers.cmake | 105 | ||||
| -rw-r--r-- | coin/instructions/README.md | 6 | ||||
| -rw-r--r-- | coin/instructions/cmake_cross_compilation_module_build_instructions.yaml | 14 | ||||
| -rw-r--r-- | coin/instructions/cmake_module_build_instructions.yaml | 14 | ||||
| -rw-r--r-- | examples/network/doc/src/http.qdoc | 9 | ||||
| -rw-r--r-- | examples/network/http/httpwindow.cpp | 11 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 13 | ||||
| -rw-r--r-- | src/tools/macdeployqt/shared/shared.cpp | 27 |
11 files changed, 613 insertions, 47 deletions
diff --git a/cmake/QtBuildHelpers.cmake b/cmake/QtBuildHelpers.cmake index 3ef292b27bc..6a1dc543145 100644 --- a/cmake/QtBuildHelpers.cmake +++ b/cmake/QtBuildHelpers.cmake @@ -301,6 +301,7 @@ function(qt_internal_get_qt_build_public_helpers out_var) QtPublicSbomCommonGenerationHelpers QtPublicSbomCpeHelpers QtPublicSbomCycloneDXHelpers + QtPublicSbomDocumentNamespaceHelpers QtPublicSbomDepHelpers QtPublicSbomFileHelpers QtPublicSbomGenerationHelpers diff --git a/cmake/QtPublicSbomCycloneDXHelpers.cmake b/cmake/QtPublicSbomCycloneDXHelpers.cmake index a3dc52d4e39..92b26bb0525 100644 --- a/cmake/QtPublicSbomCycloneDXHelpers.cmake +++ b/cmake/QtPublicSbomCycloneDXHelpers.cmake @@ -226,9 +226,7 @@ function(_qt_internal_sbom_get_cyclone_bom_serial_number) _qt_internal_sbom_set_default_option_value_and_error_if_empty(SPDX_NAMESPACE "") - # This is a randomly generated uuid v4 value. To be used for all eternity. Until we change the - # implementation of the function. - set(uuid_namespace "c024642f-9853-45b2-9bfd-ab3f061a05bb") + _qt_internal_sbom_get_document_namespace_uuid_namespace(uuid_namespace) string(UUID uuid NAMESPACE "${uuid_namespace}" NAME "${arg_SPDX_NAMESPACE}" TYPE SHA1) set(cyclone_dx_serial_number "urn:cdx:${uuid}") diff --git a/cmake/QtPublicSbomDocumentNamespaceHelpers.cmake b/cmake/QtPublicSbomDocumentNamespaceHelpers.cmake new file mode 100644 index 00000000000..0293c163dec --- /dev/null +++ b/cmake/QtPublicSbomDocumentNamespaceHelpers.cmake @@ -0,0 +1,456 @@ +# Copyright (C) 2025 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Computes the SPDX document namespace field. +# See https://spdx.github.io/spdx-spec/v2.3/document-creation-information/#65-spdx-document-namespace-field +# The document namespace is used in SPDX external references and dependency relationships. +function(_qt_internal_sbom_compute_project_namespace out_var) + set(opt_args "") + set(single_args + SUPPLIER_URL + PROJECT_NAME + VERSION_SUFFIX + DOCUMENT_NAMESPACE_INFIX + DOCUMENT_NAMESPACE_SUFFIX + DOCUMENT_NAMESPACE_URL_PREFIX + ) + set(multi_args "") + + cmake_parse_arguments(PARSE_ARGV 1 arg "${opt_args}" "${single_args}" "${multi_args}") + _qt_internal_validate_all_args_are_parsed(arg) + + if(NOT arg_PROJECT_NAME) + message(FATAL_ERROR "PROJECT_NAME must be set") + endif() + + if(NOT arg_SUPPLIER_URL) + message(FATAL_ERROR "SUPPLIER_URL must be set") + endif() + + string(TOLOWER "${arg_PROJECT_NAME}" project_name_lowercase) + + set(version_suffix "") + + if(arg_VERSION_SUFFIX) + set(version_suffix "-${arg_VERSION_SUFFIX}") + else() + _qt_internal_sbom_get_git_version_vars() + if(QT_SBOM_GIT_VERSION) + set(version_suffix "-${QT_SBOM_GIT_VERSION}") + endif() + endif() + + set(namespace "${project_name_lowercase}${version_suffix}") + + if(arg_DOCUMENT_NAMESPACE_INFIX) + string(APPEND namespace "${arg_DOCUMENT_NAMESPACE_INFIX}") + endif() + + if(arg_DOCUMENT_NAMESPACE_SUFFIX) + string(APPEND namespace "${arg_DOCUMENT_NAMESPACE_SUFFIX}") + endif() + + if(arg_DOCUMENT_NAMESPACE_URL_PREFIX) + set(url_prefix "${arg_DOCUMENT_NAMESPACE_URL_PREFIX}") + else() + set(url_prefix "${arg_SUPPLIER_URL}/spdxdocs") + endif() + + set(repo_spdx_namespace "${url_prefix}/${namespace}") + + set(${out_var} "${repo_spdx_namespace}" PARENT_SCOPE) +endfunction() + +# A document namespace is recommended to be either a URI + v4 random UUID or a URI + v5 UUID +# generated from a sha1 checksum. +# It needs to be unique per document. +# Having randomness is bad for build reproducibility, so the v4 UUID is not a good idea. +# +# Collecting enough unique content as part of the build for a checksum is difficult +# without outside input, and because the final document contents is only available at install time. +# +# We currently create a fake URI (that is not hosted on a web service) and a combination of the +# following info: +# - project name +# - project version +# - document namespace infix, which consists of: +# - platform and arch info (host + target) +# - a v5 UUID based on various inputs +# - extra content provided as input +# - document namespace suffix (as a last resort) +# +# The document namespace infix should make the namespace unique enough, so that different +# builds don't usually map to the same value, and thus is conformant to the spec. +function(_qt_internal_sbom_compute_uniqueish_document_namespace_infix) + set(opt_args "") + set(single_args + UUID_EXTRA_CONTENT + OUT_VAR_INFIX + OUT_VAR_UUID_INFIX + OUT_VAR_UUID_INFIX_MERGED + ) + set(multi_args "") + + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + _qt_internal_validate_all_args_are_parsed(arg) + + if(NOT arg_OUT_VAR_INFIX AND NOT arg_OUT_VAR_UUID_INFIX AND NOT arg_OUT_VAR_UUID_INFIX_MERGED) + message(FATAL_ERROR "One of OUT_VAR_INFIX, OUT_VAR_UUID_INFIX or " + "OUT_VAR_UUID_INFIX_MERGED must be set") + endif() + + if(QT_SBOM_NO_UNIQUE_NAMESPACE_INFIX) + set(${arg_OUT_VAR_INFIX} "" PARENT_SCOPE) + + if(arg_OUT_VAR_UUID_INFIX) + set(${arg_OUT_VAR_UUID_INFIX} "" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_UUID_INFIX_MERGED) + set(${arg_OUT_VAR_UUID_INFIX_MERGED} "" PARENT_SCOPE) + endif() + + return() + endif() + + # Collect the various pieces of information to build the unique-ish infix. + set(main_value "") + + _qt_internal_sbom_get_host_platform_name(host_platform_name) + if(host_platform_name) + string(APPEND main_value "host-${host_platform_name}") + endif() + + _qt_internal_sbom_get_host_platform_architecture(host_arch) + if(host_arch) + string(APPEND main_value "-${host_arch}") + endif() + + _qt_internal_sbom_get_target_platform_friendly_name(target_platform_name) + if(target_platform_name) + string(APPEND main_value "-target-${target_platform_name}") + endif() + + _qt_internal_sbom_get_target_platform_architecture(target_arch) + if(target_arch) + string(APPEND main_value "-${target_arch}") + endif() + + + # Collect the pieces for the infix uuid part. + set(uuid_content "<main_value>:${main_value}\n") + + _qt_internal_sbom_get_build_tools_info_for_namespace_infix_uuid(tools_info) + if(tools_info) + string(APPEND uuid_content "<build_tools_info>:${tools_info}\n") + endif() + + if(arg_UUID_EXTRA_CONTENT) + string(APPEND uuid_content "<extra_content>:\n${arg_UUID_EXTRA_CONTENT}\n") + endif() + + if(QT_SBOM_NAMESPACE_INFIX_UUID_EXTRA_CONTENT) + string(APPEND uuid_content + "<extra_content_var>:${QT_SBOM_NAMESPACE_INFIX_UUID_EXTRA_CONTENT}\n") + endif() + + _qt_internal_sbom_compute_document_namespace_infix_uuid( + UUID_CONTENT "${uuid_content}" + OUT_VAR_UUID uuid_value + ) + + if(arg_OUT_VAR_INFIX) + set(${arg_OUT_VAR_INFIX} "${main_value}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_UUID_INFIX) + set(${arg_OUT_VAR_UUID_INFIX} "${uuid_value}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_UUID_INFIX_MERGED) + set(${arg_OUT_VAR_UUID_INFIX_MERGED} "${main_value}-${uuid_value}" PARENT_SCOPE) + endif() +endfunction() + +# Computes the uuid part of a SPDX document namespace, given the inputs. +# UUID_CONTENT - should be given enough unique content to ensure the uniqueness of generated the +# uuid based on the content. +# +# Allow various overrides like: +# - override of the full uuid content via QT_SBOM_FORCE_DOCUMENT_NAMESPACE_INFIX_UUID_CONTENT +# - allow using a random value via QT_SBOM_FORCE_RANDOM_DOCUMENT_NAMESPACE_INFIX_UUID_CONTENT +# - allow setting a specific uuid via QT_SBOM_FORCE_DOCUMENT_NAMESPACE_INFIX_UUID +# - fake deterministic uuid (only useful for development purposes of this code) +function(_qt_internal_sbom_compute_document_namespace_infix_uuid) + set(opt_args "") + set(single_args + UUID_CONTENT + OUT_VAR_UUID + ) + set(multi_args "") + + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + _qt_internal_validate_all_args_are_parsed(arg) + + if(NOT arg_OUT_VAR_UUID) + message(FATAL_ERROR "OUT_VAR_UUID must be set") + endif() + + set(content "${arg_UUID_CONTENT}") + + _qt_internal_sbom_get_document_namespace_uuid_namespace(uuid_namespace) + + # Allow various overrides. + if(QT_SBOM_FAKE_DETERMINISTIC_BUILD + # This is to allow developers test a fake build, without a fake uuid + AND NOT QT_SBOM_NO_FAKE_DETERMINISTIC_BUILD_DOCUMENT_NAMESPACE_INFIX_UUID + ) + set(uuid_content "<fake_deterministic_build>") + elseif(QT_SBOM_FORCE_DOCUMENT_NAMESPACE_INFIX_UUID_CONTENT) + set(uuid_content "${QT_SBOM_FORCE_DOCUMENT_NAMESPACE_INFIX_UUID_CONTENT}") + elseif(QT_SBOM_FORCE_RANDOM_DOCUMENT_NAMESPACE_INFIX_UUID_CONTENT) + string(RANDOM LENGTH 256 uuid_content) + else() + set(uuid_content "${content}") + endif() + + # Also allow direct override of uuid. + if(QT_SBOM_FORCE_DOCUMENT_NAMESPACE_INFIX_UUID) + set(namespace_infix_uuid "${QT_SBOM_FORCE_DOCUMENT_NAMESPACE_INFIX_UUID}") + else() + string(UUID namespace_infix_uuid + NAMESPACE "${uuid_namespace}" NAME "${uuid_content}" TYPE SHA1) + endif() + + set(${arg_OUT_VAR_UUID} "${namespace_infix_uuid}" PARENT_SCOPE) +endfunction() + +# A v4 uuid to be used as a namespace value for generating v5 uuids. +function(_qt_internal_sbom_get_document_namespace_uuid_namespace out_var) + # This is a randomly generated uuid v4 value. To be used for all eternity. Until we change the + # implementation of the function. + set(uuid_namespace "c024642f-9853-45b2-9bfd-ab3f061a05bb") + set(${out_var} "${uuid_namespace}" PARENT_SCOPE) +endfunction() + +# Collects extra uuid content for generating a more unique document namespace uuid for qt repos. +function(_qt_internal_sbom_compute_qt_uniqueish_document_namespace_infix) + set(opt_args "") + set(single_args + OUT_VAR_INFIX + OUT_VAR_UUID_INFIX + OUT_VAR_UUID_INFIX_MERGED + ) + set(multi_args "") + + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + _qt_internal_validate_all_args_are_parsed(arg) + + if(NOT arg_OUT_VAR_INFIX AND NOT arg_OUT_VAR_UUID_INFIX AND NOT arg_OUT_VAR_UUID_INFIX_MERGED) + message(FATAL_ERROR "One of OUT_VAR_INFIX, OUT_VAR_UUID_INFIX or " + "OUT_VAR_UUID_INFIX_MERGED must be set") + endif() + + if(QT_SBOM_NO_UNIQUE_QT_NAMESPACE_INFIX) + set(${arg_OUT_VAR_INFIX} "" PARENT_SCOPE) + + if(arg_OUT_VAR_UUID_INFIX) + set(${arg_OUT_VAR_UUID_INFIX} "" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_UUID_INFIX_MERGED) + set(${arg_OUT_VAR_UUID_INFIX_MERGED} "" PARENT_SCOPE) + endif() + + return() + endif() + + set(uuid_extra_content "") + + if(APPLE AND (CMAKE_OSX_ARCHITECTURES MATCHES ";")) + string(CONCAT building_for + "${QT_QMAKE_TARGET_MKSPEC} (${CMAKE_OSX_ARCHITECTURES}), ${TEST_architecture_arch} " + "features: ${subarch_summary})") + else() + string(CONCAT building_for + "${QT_QMAKE_TARGET_MKSPEC} (${TEST_architecture_arch}, " + "CPU features: ${subarch_summary})") + endif() + + string(APPEND uuid_extra_content "<building_for>:${building_for}\n") + + _qt_internal_get_configure_line(configure_line) + if(configure_line) + string(APPEND uuid_extra_content "<configure_line>:${configure_line}\n") + endif() + + _qt_internal_sbom_compute_uniqueish_document_namespace_infix( + UUID_EXTRA_CONTENT "${uuid_extra_content}" + OUT_VAR_INFIX infix + OUT_VAR_UUID_INFIX uuid_infix + OUT_VAR_UUID_INFIX_MERGED uuid_infix_merged + ) + + if(arg_OUT_VAR_INFIX) + set(${arg_OUT_VAR_INFIX} "${infix}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_UUID_INFIX) + set(${arg_OUT_VAR_UUID_INFIX} "${uuid_infix}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_UUID_INFIX_MERGED) + set(${arg_OUT_VAR_UUID_INFIX_MERGED} "${uuid_infix_merged}" PARENT_SCOPE) + endif() +endfunction() + +# Returns a lower case host platform name for sbom document namespace purposes. +function(_qt_internal_sbom_get_host_platform_name out_var) + string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" main_value) + if(NOT main_value) + set(main_value "unknown-platform") + endif() + + set(${out_var} "${main_value}" PARENT_SCOPE) +endfunction() + +# Returns a lower case target platform name for sbom document namespace purposes. +function(_qt_internal_sbom_get_target_platform_friendly_name out_var) + string(TOLOWER "${CMAKE_SYSTEM_NAME}" lower_system_name) + set(friendly_name "${lower_system_name}") + + if(NOT friendly_name) + set(friendly_name "unknown-platform") + endif() + + if(MSVC) + string(APPEND friendly_name "-msvc") + endif() + + if(MINGW) + string(APPEND friendly_name "-mingw") + endif() + + if(CYGWIN) + string(APPEND friendly_name "-cygwin") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(friendly_name "linux") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "HPUX") + set(friendly_name "hpux") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Android") + set(friendly_name "android") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Integrity") + set(friendly_name "integrity") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "VxWorks") + set(friendly_name "vxworks") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "QNX") + set(friendly_name "qnx") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(friendly_name "openbsd") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set(friendly_name "freebsd") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD") + set(friendly_name "netbsd") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR EMSCRIPTEN) + set(friendly_name "wasm") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + set(friendly_name "sunos") + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "GNU") + set(friendly_name "hurd") + endif() + + if(CMAKE_CXX_FLAGS MATCHES "-D__WEBOS__") + set(friendly_name "webos") + endif() + + if(APPLE) + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(friendly_name "ios") + elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS") + set(friendly_name "tvos") + elseif(CMAKE_SYSTEM_NAME STREQUAL "watchOS") + set(friendly_name "watchos") + elseif(CMAKE_SYSTEM_NAME STREQUAL "visionOS") + set(friendly_name "visionos") + else() + set(friendly_name "macos") + endif() + endif() + + set(${out_var} "${friendly_name}" PARENT_SCOPE) +endfunction() + +# Returns the host architecture for sbom document namespace purposes. +function(_qt_internal_sbom_get_host_platform_architecture out_var) + set(main_value "${CMAKE_HOST_SYSTEM_PROCESSOR}") + + if(QT_SBOM_HOST_PLATFORM_ARCHITECTURE) + set(main_value "${QT_SBOM_HOST_PLATFORM_ARCHITECTURE}") + endif() + + string(TOLOWER "${main_value}" main_value) + + set(${out_var} "${main_value}" PARENT_SCOPE) +endfunction() + +# Returns the target architecture for sbom document namespace purposes. +function(_qt_internal_sbom_get_target_platform_architecture out_var) + set(main_value "") + if(APPLE) + set(main_value "${CMALE_OSX_ARCHITECTURES}") + string(REPLACE ";" "_" main_value "${main_value}") + endif() + + if(NOT main_value) + set(main_value "${CMAKE_SYSTEM_PROCESSOR}") + endif() + + if(QT_SBOM_TARGET_PLATFORM_ARCHITECTURE) + set(main_value "${QT_SBOM_TARGET_PLATFORM_ARCHITECTURE}") + endif() + + string(TOLOWER "${main_value}" main_value) + + set(${out_var} "${main_value}" PARENT_SCOPE) +endfunction() + +# Returns various build tool information ofr document namespace purposes. +function(_qt_internal_sbom_get_build_tools_info_for_namespace_infix_uuid out_var) + set(content "") + + string(APPEND content "<cmake_version>: ${CMAKE_VERSION}\n") + string(APPEND content "<cmake_generator>: ${CMAKE_GENERATOR}\n") + string(APPEND content "<compiler>: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}\n") + + if(CMAKE_CXX_COMPILER_LINKER_ID) + string(APPEND content "<linker>: ${CMAKE_CXX_COMPILER_LINKER_ID} " + "${CMAKE_CXX_COMPILER_LINKER_VERSION} " + "${CMAKE_CXX_COMPILER_LINKER_FRONTEND_VARIANT}\n") + endif() + + set(${out_var} "${content}" PARENT_SCOPE) +endfunction() diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake index 3d66e7ff783..45342c2efb6 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake @@ -30,6 +30,7 @@ function(_qt_internal_sbom_begin_project) set(opt_args USE_GIT_VERSION __QT_INTERNAL_HANDLE_QT_REPO + NO_AUTO_DOCUMENT_NAMESPACE_INFIX ) set(single_args INSTALL_PREFIX @@ -39,6 +40,9 @@ function(_qt_internal_sbom_begin_project) SUPPLIER_URL DOWNLOAD_LOCATION DOCUMENT_NAMESPACE + DOCUMENT_NAMESPACE_INFIX + DOCUMENT_NAMESPACE_SUFFIX + DOCUMENT_NAMESPACE_URL_PREFIX VERSION SBOM_PROJECT_NAME QT_REPO_PROJECT_NAME @@ -110,13 +114,72 @@ function(_qt_internal_sbom_begin_project) ) _qt_internal_handle_sbom_project_version(${sbom_project_version_args}) + if(arg___QT_INTERNAL_HANDLE_QT_REPO) + _qt_internal_sbom_compute_qt_uniqueish_document_namespace_infix( + OUT_VAR_UUID_INFIX_MERGED document_namespace_infix + ) + if(document_namespace_infix) + set(arg_DOCUMENT_NAMESPACE_INFIX "-${document_namespace_infix}") + endif() + endif() + if(arg_DOCUMENT_NAMESPACE) set(repo_spdx_namespace "${arg_DOCUMENT_NAMESPACE}") + + if(QT_SBOM_DOCUMENT_NAMESPACE_INFIX) + string(APPEND repo_spdx_namespace "${QT_SBOM_DOCUMENT_NAMESPACE_INFIX}") + elseif(arg_DOCUMENT_NAMESPACE_INFIX) + string(APPEND repo_spdx_namespace "${arg_DOCUMENT_NAMESPACE_INFIX}") + elseif(NOT arg_NO_AUTO_DOCUMENT_NAMESPACE_INFIX + AND NOT QT_SBOM_NO_AUTO_DOCUMENT_NAMESPACE_INFIX) + _qt_internal_sbom_compute_uniqueish_document_namespace_infix( + OUT_VAR_UUID_INFIX_MERGED document_namespace_infix + ) + string(APPEND repo_spdx_namespace "-${document_namespace_infix}") + endif() + + if(QT_SBOM_DOCUMENT_NAMESPACE_SUFFIX) + string(APPEND repo_spdx_namespace "${QT_SBOM_DOCUMENT_NAMESPACE_SUFFIX}") + elseif(arg_DOCUMENT_NAMESPACE_SUFFIX) + string(APPEND repo_spdx_namespace "${arg_DOCUMENT_NAMESPACE_SUFFIX}") + endif() else() set(compute_project_namespace_args "") if(repo_supplier_url) list(APPEND compute_project_namespace_args SUPPLIER_URL "${repo_supplier_url}") endif() + + if(QT_SBOM_DOCUMENT_NAMESPACE_INFIX) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_INFIX "${QT_SBOM_DOCUMENT_NAMESPACE_INFIX}") + elseif(arg_DOCUMENT_NAMESPACE_INFIX) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_INFIX "${arg_DOCUMENT_NAMESPACE_INFIX}") + elseif(NOT arg_NO_AUTO_DOCUMENT_NAMESPACE_INFIX + AND NOT QT_SBOM_NO_AUTO_DOCUMENT_NAMESPACE_INFIX) + _qt_internal_sbom_compute_uniqueish_document_namespace_infix( + OUT_VAR_UUID_INFIX_MERGED document_namespace_infix + ) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_INFIX "-${document_namespace_infix}") + endif() + + if(QT_SBOM_DOCUMENT_NAMESPACE_SUFFIX) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_SUFFIX "${QT_SBOM_DOCUMENT_NAMESPACE_SUFFIX}") + elseif(arg_DOCUMENT_NAMESPACE_SUFFIX) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_SUFFIX "${arg_DOCUMENT_NAMESPACE_SUFFIX}") + endif() + + if(QT_SBOM_DOCUMENT_NAMESPACE_URL_PREFIX) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_URL_PREFIX "${QT_SBOM_DOCUMENT_NAMESPACE_URL_PREFIX}") + elseif(arg_DOCUMENT_NAMESPACE_URL_PREFIX) + list(APPEND compute_project_namespace_args + DOCUMENT_NAMESPACE_URL_PREFIX "${arg_DOCUMENT_NAMESPACE_URL_PREFIX}") + endif() + _qt_internal_sbom_compute_project_namespace(repo_spdx_namespace PROJECT_NAME "${repo_project_name_lowercase}" ${compute_project_namespace_args} @@ -2332,48 +2395,6 @@ function(_qt_internal_get_configure_line out_var) set(${out_var} "${content}" PARENT_SCOPE) endfunction() -function(_qt_internal_sbom_compute_project_namespace out_var) - set(opt_args "") - set(single_args - SUPPLIER_URL - PROJECT_NAME - VERSION_SUFFIX - ) - set(multi_args "") - - cmake_parse_arguments(PARSE_ARGV 1 arg "${opt_args}" "${single_args}" "${multi_args}") - _qt_internal_validate_all_args_are_parsed(arg) - - if(NOT arg_PROJECT_NAME) - message(FATAL_ERROR "PROJECT_NAME must be set") - endif() - - if(NOT arg_SUPPLIER_URL) - message(FATAL_ERROR "SUPPLIER_URL must be set") - endif() - - string(TOLOWER "${arg_PROJECT_NAME}" project_name_lowercase) - - set(version_suffix "") - - if(arg_VERSION_SUFFIX) - set(version_suffix "-${arg_VERSION_SUFFIX}") - else() - _qt_internal_sbom_get_git_version_vars() - if(QT_SBOM_GIT_VERSION) - set(version_suffix "-${QT_SBOM_GIT_VERSION}") - endif() - endif() - - # Used in external refs, it should be either aa URI + UUID or a URI + checksum. - # We currently use a URI + git version, which is probably not conformant to the spec. - set(repo_name_and_version "${project_name_lowercase}${version_suffix}") - set(repo_spdx_namespace - "${arg_SUPPLIER_URL}/spdxdocs/${repo_name_and_version}") - - set(${out_var} "${repo_spdx_namespace}" PARENT_SCOPE) -endfunction() - function(_qt_internal_sbom_compute_project_file_name out_var) set(opt_args SPDX_TAG_VALUE diff --git a/coin/instructions/README.md b/coin/instructions/README.md index f366642395d..86a46efe051 100644 --- a/coin/instructions/README.md +++ b/coin/instructions/README.md @@ -32,6 +32,10 @@ The following environment variables are used in Coin instructions when building that will be passed to a non-qtbase qt-configure-module call `NON_QTBASE_CMAKE_ARGS` - contains platform-specific ``CMake-style`` arguments that will be passed to a non-qtbase qt-configure-module call +`<MODULE>_CONFIGURE_ARGS` - contains platform-specific ``configure-style`` arguments + that will be passed to the specified module's qt-configure-module call +`<MODULE>_CMAKE_ARGS` - contains platform-specific ``CMake-style`` arguments + that will be passed to the specified module's qt-configure-module call `COMMON_CMAKE_ARGS` - platform-independent ``CMake-style`` args set in `prepare_building_env.yaml` that apply to qtbase configurations only. @@ -51,6 +55,8 @@ mirror the ones above. They are: `TARGET_CMAKE_ARGS` `NON_QTBASE_TARGET_CONFIGURE_ARGS` `NON_QTBASE_TARGET_CMAKE_ARGS` +`<MODULE>_TARGET_CONFIGURE_ARGS` +`<MODULE>_TARGET_CMAKE_ARGS` `COMMON_TARGET_CMAKE_ARGS` `COMMON_NON_QTBASE_TARGET_CMAKE_ARGS` diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index cf308fc7836..1d60af72831 100644 --- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml @@ -36,6 +36,20 @@ instructions: - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS variableValue: "{{.Env.NON_QTBASE_TARGET_CMAKE_ARGS}} {{.Env.COMMON_NON_QTBASE_TARGET_CMAKE_ARGS}}" + - type: AppendToEnvironmentVariable + variableName: COIN_CONFIGURE_ARGS + variableValue: " ${{ToUpper .Env.TESTED_MODULE_COIN}}_TARGET_CONFIGURE_ARGS" + enable_if: + condition: runtime + env_var: "{{ToUpper .Env.TESTED_MODULE_COIN}}_TARGET_CONFIGURE_ARGS" + not_equals_value: null + - type: AppendToEnvironmentVariable + variableName: COIN_CMAKE_ARGS + variableValue: " ${{ToUpper .Env.TESTED_MODULE_COIN}}_TARGET_CMAKE_ARGS" + enable_if: + condition: runtime + env_var: "{{ToUpper .Env.TESTED_MODULE_COIN}}_TARGET_CMAKE_ARGS" + not_equals_value: null - type: EnvironmentVariable variableName: CONFIGURE_ENV_PREFIX variableValue: "{{.Env.TARGET_ENV_PREFIX}}" diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index 788074a4bf6..3d83d4ac0dc 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -17,6 +17,20 @@ instructions: - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS variableValue: "{{.Env.NON_QTBASE_CMAKE_ARGS}} {{.Env.COMMON_NON_QTBASE_CMAKE_ARGS}}" + - type: AppendToEnvironmentVariable + variableName: CONFIGURE_ARGS + variableValue: " ${{ToUpper .Env.TESTED_MODULE_COIN}}_CONFIGURE_ARGS" + enable_if: + condition: runtime + env_var: "{{ToUpper .Env.TESTED_MODULE_COIN}}_CONFIGURE_ARGS" + not_equals_value: null + - type: AppendToEnvironmentVariable + variableName: COIN_CMAKE_ARGS + variableValue: " ${{ToUpper .Env.TESTED_MODULE_COIN}}_CMAKE_ARGS" + enable_if: + condition: runtime + env_var: "{{ToUpper .Env.TESTED_MODULE_COIN}}_CMAKE_ARGS" + not_equals_value: null - type: EnvironmentVariable variableName: CONFIGURE_ENV_PREFIX variableValue: "{{.Env.ENV_PREFIX}}" diff --git a/examples/network/doc/src/http.qdoc b/examples/network/doc/src/http.qdoc index a07d0fe73b0..e8ebc907e92 100644 --- a/examples/network/doc/src/http.qdoc +++ b/examples/network/doc/src/http.qdoc @@ -18,6 +18,15 @@ The main work of this example is done in the HttpWindow class. Thus we will focus on that. + \snippet http/httpwindow.cpp qnam-tcpkeepalive + + Since Qt 6.11, it is possible to explicitly specify the TCP keepalive + parameters for a QNetworkRequest. In the snippet above, we are overriding + the defaults used by QNetworkAccessManager to follow a more aggressive + strategy. This can be useful, for example, in early detection of network + hangs caused by network changes on Linux. In this particular example, the + connection will be closed after thirty seconds of inactivity. + \snippet http/httpwindow.cpp qnam-download Using QNetworkAccessManager, we begin the download of a resource as diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index 3d1c2467d84..3a4ae098321 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -10,6 +10,8 @@ #include <QUrl> #include <memory> +#include <chrono> +using namespace std::chrono_literals; #if QT_CONFIG(ssl) const char defaultUrl[] = "https://www.qt.io/"; @@ -95,8 +97,15 @@ void HttpWindow::startRequest(const QUrl &requestedUrl) url = requestedUrl; httpRequestAborted = false; + //! [qnam-tcpkeepalive] + QNetworkRequest networkRequest(url); + networkRequest.setTcpKeepAliveIdleTimeBeforeProbes(20s); + networkRequest.setTcpKeepAliveIntervalBetweenProbes(2s); + networkRequest.setTcpKeepAliveProbeCount(5); + //! [qnam-tcpkeepalive] + //! [qnam-download] - reply.reset(qnam.get(QNetworkRequest(url))); + reply.reset(qnam.get(networkRequest)); //! [qnam-download] //! [connecting-reply-to-slots] connect(reply.get(), &QNetworkReply::finished, this, &HttpWindow::httpFinished); diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 6428653de26..66bb65685fa 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -216,6 +216,19 @@ static void ensureInitialized() can be: \snippet code/src_network_access_qnetworkaccessmanager.cpp 1 + Since Qt 6.11 the defaults of the TCP Keepalive parameters used by + QNetworkAccessManager have been changed. With the current settings + the connection will be terminated after 2 minutes of inactivity. + + These settings can be changed the individual requests, to make + them more lenient, or even more aggressive via the QNetworkRequest API. + \snippet http/httpwindow.cpp qnam-tcpkeepalive + + In the above snippet we are picking a more aggressive strategy, to + terminate the connection after thirty seconds of inactivity. This can + be useful, for example, in early detection of network hangs caused + by network changes on Linux. + \sa QNetworkRequest, QNetworkReply, QNetworkProxy */ diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp index 0731fb616ed..7f8590ae894 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp @@ -1008,6 +1008,31 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks, rpathsUsed.append(framework.rpathUsed); } + // To properly find all dependencies of the current framework / library further down in + // getQtFrameworks, we need to get its rpaths, resolve them in the context of its original + // location before it is copied, and add them as candidate rpaths. + // + // This is necessary to handle cases like + // (1) QtNetwork.framework -> (2) libbrotlidec.dylib -> (3) libbrotlicommon.1.dylib + // to correctly resolve the path to (3) when it is referenced as + // '@rpath/libbrotlicommon.1.dylib' and (2) has an LC_RPATH of '@loader_path/../lib', and + // no other absolute rpaths. So the '@loader_path/../lib' will be resolved relative + // to (2)'s original location and its LC_RPATH. + // + // Otherwise we'd only have the Qt prefix and the current bundle app dir as rpath + // candidates, and once (2) is copied into the app bundle, there's no way + // '@rpath/libbrotlicommon.1.dylib' could resolve to the real path on disk from the two + // candidates above. + if (!framework.sourceFilePath.isEmpty()) { + const QList<QString> sourceRPaths = getBinaryRPaths(framework.sourceFilePath, true); + for (const QString &sourceRPath : sourceRPaths) { + const QDir sourceRPathDir(sourceRPath); + if (sourceRPathDir.exists() && !rpathsUsed.contains(sourceRPath)) { + rpathsUsed.append(sourceRPath); + } + } + } + // Copy the framework/dylib to the app bundle. const QString deployedBinaryPath = framework.isDylib ? copyDylib(framework, bundlePath) : copyFramework(framework, bundlePath); @@ -1032,7 +1057,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks, for (const FrameworkInfo &dependency : dependencies) { if (dependency.rpathUsed.isEmpty()) { changeInstallName(bundlePath, dependency, QStringList() << deployedBinaryPath, useLoaderPath); - } else { + } else if (!rpathsUsed.contains(dependency.rpathUsed)) { rpathsUsed.append(dependency.rpathUsed); } |