From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 22 Sep 2024 19:08:16 +0000 (+0300)
Subject: cross
X-Git-Tag: archive/raspbian/6.6.2+dfsg-12+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c51a1d0238edcd2fc00e71a70bdd01787041931;p=qt6-base.git

cross


Gbp-Pq: Name cross.patch
---

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"