bug 36803: import the current state of the qt 6.7 branch

Author: christoph-cullmann

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

@@ -169,6 +169,7 @@ installPackages+=(ssh)
 installPackages+=(diffstat)
 installPackages+=(binfmt-support)
 installPackages+=(zstd)
+installPackages+=(libzstd-dev)
 # Vulkan is needed for examples
 installPackages+=(libvulkan-dev)
 # Needed for qtdltlogging

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

@@ -27,6 +27,7 @@ installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
 installPackages+=(double-conversion-devel)
 installPackages+=(zstd)
+installPackages+=(libzstd-devel)
 # EGL support
 installPackages+=(mesa-libEGL-devel)
 installPackages+=(mesa-libGL-devel)

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

@@ -28,6 +28,7 @@ installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
 installPackages+=(double-conversion-devel)
 installPackages+=(zstd)
+installPackages+=(libzstd-devel)
 # EGL support
 installPackages+=(mesa-libEGL-devel)
 installPackages+=(mesa-libGL-devel)

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

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
 installPackages+=(double-conversion-devel)
 installPackages+=(zstd)
+installPackages+=(libzstd-devel)
 # update kernel
 installPackages+=(kernel)
 installPackages+=(kernel-tools)

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

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
 installPackages+=(double-conversion-devel)
 installPackages+=(zstd)
+installPackages+=(libzstd-devel)
 # update kernel
 installPackages+=(kernel)
 installPackages+=(kernel-tools)

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

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
 installPackages+=(double-conversion-devel)
 installPackages+=(zstd)
+installPackages+=(libzstd-devel)
 # EGL support
 # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
 installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)

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

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
 installPackages+=(double-conversion-devel)
 installPackages+=(zstd)
+installPackages+=(libzstd-devel)
 # EGL support
 # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
 #installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)

src/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh

@@ -198,6 +198,7 @@ installPackages+=(ssh)
 installPackages+=(diffstat)
 installPackages+=(binfmt-support)
 installPackages+=(zstd)
+installPackages+=(libzstd-dev)
 # Vulkan is needed for examples
 installPackages+=(libvulkan-dev)
 # Needed for qtdltlogging

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

@@ -202,6 +202,7 @@ installPackages+=(ssh)
 installPackages+=(diffstat)
 installPackages+=(binfmt-support)
 installPackages+=(zstd)
+installPackages+=(libzstd-dev)
 installPackages+=(lz4)
 # Vulkan is needed for examples
 installPackages+=(libvulkan-dev)

src/qtbase/cmake/QtBuildRepoHelpers.cmake

@@ -555,14 +555,17 @@ macro(qt_build_repo_impl_tests)
             message(FATAL_ERROR
                 "Can't build both standalone tests and standalone examples at once.")
         endif()
-        option(QT_BUILD_TESTS_PROJECT_${PROJECT_NAME} "Configure tests for project ${PROJECT_NAME}" TRUE)
+        string(TOLOWER "${PROJECT_NAME}" __qt_repo_project_name_lowercase)
+        option(QT_BUILD_TESTS_PROJECT_${__qt_repo_project_name_lowercase}
+            "Configure tests for project ${__qt_repo_project_name_lowercase}" TRUE)
 
-        if (QT_BUILD_TESTS_PROJECT_${PROJECT_NAME})
+        if (QT_BUILD_TESTS_PROJECT_${__qt_repo_project_name_lowercase})
             add_subdirectory(tests)
             if(NOT QT_BUILD_TESTS_BY_DEFAULT)
                 set_property(DIRECTORY tests PROPERTY EXCLUDE_FROM_ALL TRUE)
             endif()
         endif()
+        unset(__qt_repo_project_name_lowercase)
     endif()
 endmacro()
 
@@ -576,10 +579,13 @@ macro(qt_build_repo_impl_examples)
 
         message(STATUS "Configuring examples.")
 
-        option(QT_BUILD_EXAMPLES_PROJECT_${PROJECT_NAME} "Configure examples for project ${PROJECT_NAME}" TRUE)
-        if (QT_BUILD_EXAMPLES_PROJECT_${PROJECT_NAME})
+        string(TOLOWER "${PROJECT_NAME}" __qt_repo_project_name_lowercase)
+        option(QT_BUILD_EXAMPLES_PROJECT_${__qt_repo_project_name_lowercase}
+            "Configure examples for project ${__qt_repo_project_name_lowercase}" TRUE)
+        if(QT_BUILD_EXAMPLES_PROJECT_${__qt_repo_project_name_lowercase})
             add_subdirectory(examples)
         endif()
+        unset(__qt_repo_project_name_lowercase)
     endif()
 endmacro()