From 19dd04ab968931a82b8c46bf8c87d7d4aa5b5116 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Fri, 18 Jul 2025 15:28:20 +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 06d7d532..246771df 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 f813b727..a15eb0af 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