From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 28 May 2023 08:41:24 +0000 (+0100)
Subject: cross
X-Git-Tag: archive/raspbian/6.4.2+dfsg-10+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b2948bd057206316c4422e0f0c250c960621df65;p=qt6-base.git

cross


Gbp-Pq: Name cross.patch
---

diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index f51e4d6a..7b125c04 100644
--- 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 86b9fa70..bbd884ef 100644
--- 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"