cross

Gbp-Pq: Name cross.patch

diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index f51e4d6ab54a7cc12d407bc319477df830364ee7..7b125c0486ee74643423373f0641d509cb0c2442 100644 (file)
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -151,8 +151,6 @@ function(qt_build_internals_disable_pkg_config_if_needed)
     set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config")
     if(NOT pkg_config_enabled)
         qt_build_internals_disable_pkg_config()
-    else()
-        unset(PKG_CONFIG_EXECUTABLE CACHE)
     endif()
 endfunction()
 

diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
index 5179258c2f17284d1b30fc08671df56b3ba6bcc4..fba356151b6bb9478237c122973101c6c2ab01b3 100644 (file)
--- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt
@@ -12,6 +12,6 @@ if(TARGET Qt::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 86b9fa700028dc4b78aa51b2df12db5266a4d9c5..9bc3c575c860052d2044d6819b51588bcc311850 100644 (file)
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -2,7 +2,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)
+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
 
 qt_feature("macdeployqt" PRIVATE
     SECTION "Deployment"