From 3009e6e0417f45194d16fa3289cccd0d079835b7 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Fri, 5 Jul 2024 07:44:11 +0200 Subject: [PATCH] cross Gbp-Pq: Name cross.patch --- examples/sql/CMakeLists.txt | 2 +- src/tools/configure.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt index ce1014a0..a37daed2 100644 --- 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 0f4c1878..af406938 100644 --- 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" -- 2.30.2