From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sat, 1 Mar 2025 11:21:39 +0000 (+0100)
Subject: cross
X-Git-Tag: archive/raspbian/6.8.2+dfsg-5+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=164eab845b9d7f213191dc409300cb314ce6b1dd;p=qt6-base.git

cross


Gbp-Pq: Name cross.patch
---

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"