cross

Gbp-Pq: Name cross.patch

diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
index ce1014a06a1033c4662b3ee072a203932ac78c2b..a37daed271a16826f98f7a72aab96bdad88ccc9d 100644 (file)
--- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt
@@ -15,6 +15,6 @@ if(TARGET Qt6::Xml)
     qt_internal_add_example(masterdetail)
 endif()
 
-if(NOT CMAKE_CROSSCOMPILING)
+if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
     qt_internal_add_example(sqlbrowser)
 endif()

diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake
index 0f4c18784af07858453a00478717654359442c7c..af406938bf961b2d22c9a778d5e6d9940d478efe 100644 (file)
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -5,7 +5,7 @@ qt_feature("androiddeployqt" PRIVATE
     SECTION "Deployment"
     LABEL "Android deployment tool"
     PURPOSE "The Android deployment tool automates the process of creating Android packages."
-    CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
 
 qt_feature("macdeployqt" PRIVATE
     SECTION "Deployment"