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/src/tools/configure.cmake b/src/tools/configure.cmake
index 86b9fa700028dc4b78aa51b2df12db5266a4d9c5..bbd884ef01c593300e3234ee7acc830daecf88f0 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_FEATURE_regularexpression)
 
 qt_feature("macdeployqt" PRIVATE
     SECTION "Deployment"