1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Include QtAndroidHelpers and QtWasmHelpers unconditionally

Browse Source 
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)
This commit is contained in:
Alexandru Croitor 2023-11-17 17:28:36 +01:00
parent 2a20ca0ae2
commit acf72dd323
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtBuildHelpers.cmake
View File

@ -127,6 +127,7 @@ macro(qt_internal_include_all_helpers)
# Internal helpers available only while building Qt itself. # Internal helpers available only while building Qt itself.
include(Qt3rdPartyLibraryHelpers) include(Qt3rdPartyLibraryHelpers)
include(QtAndroidHelpers)
include(QtAppHelpers) include(QtAppHelpers)
include(QtAutogenHelpers) include(QtAutogenHelpers)
include(QtBuildInformation) include(QtBuildInformation)
@ -167,14 +168,7 @@ macro(qt_internal_include_all_helpers)
include(QtTestHelpers) include(QtTestHelpers)
include(QtToolHelpers) include(QtToolHelpers)
include(QtUnityBuildHelpers) include(QtUnityBuildHelpers)
if(ANDROID)
include(QtAndroidHelpers)
endif()
if(WASM)
include(QtWasmHelpers) include(QtWasmHelpers)
endif()
# Helpers that are available in public projects and while building Qt itself. # Helpers that are available in public projects and while building Qt itself.
include(QtPublicAppleHelpers) include(QtPublicAppleHelpers)