From acf72dd323d240caf61836bc8921d7837cf1500b Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Fri, 17 Nov 2023 17:28:36 +0100
Subject: [PATCH] CMake: Include QtAndroidHelpers and QtWasmHelpers
 unconditionally

They don't have side-effects, so no need to keep the checks.

Task-number: QTBUG-86035
Change-Id: Ic2c3aee1b19d8b1727936582bfe366c8277d11c2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 381d2fb014c93489d39a41436183bdbe14270621)
---
 cmake/QtBuildHelpers.cmake | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/cmake/QtBuildHelpers.cmake b/cmake/QtBuildHelpers.cmake
index 18a89ad9fa6..62a3b3d5c93 100644
--- a/cmake/QtBuildHelpers.cmake
+++ b/cmake/QtBuildHelpers.cmake
@@ -127,6 +127,7 @@ macro(qt_internal_include_all_helpers)
 
     # Internal helpers available only while building Qt itself.
     include(Qt3rdPartyLibraryHelpers)
+    include(QtAndroidHelpers)
     include(QtAppHelpers)
     include(QtAutogenHelpers)
     include(QtBuildInformation)
@@ -167,14 +168,7 @@ macro(qt_internal_include_all_helpers)
     include(QtTestHelpers)
     include(QtToolHelpers)
     include(QtUnityBuildHelpers)
-
-    if(ANDROID)
-        include(QtAndroidHelpers)
-    endif()
-
-    if(WASM)
-        include(QtWasmHelpers)
-    endif()
+    include(QtWasmHelpers)
 
     # Helpers that are available in public projects and while building Qt itself.
     include(QtPublicAppleHelpers)