From 279ae695f0abee59f5ddf6e21d556f1eaf4e1aaa Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Mon, 6 Feb 2023 19:47:48 +0000 Subject: [PATCH] cross Gbp-Pq: Name cross.patch --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 -- src/tools/configure.cmake | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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" -- 2.30.2