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

Fix android build with -no-feature-settings

Browse Source 
Add QT_FEATURE_SETTINGS to the android deployment conditions.

Change-Id: I7721a06733becba65b6d1e8112fa8afb0b64e120
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit f54fab6125d79903ebabae1b52423ac984800d26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tasuku Suzuki 2023-02-03 00:29:32 +09:00 committed by Qt Cherry-pick Bot
parent 58fc19b683
commit 5a1039c1c9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/configure.cmake
View File

@ -2,7 +2,7 @@ qt_feature("androiddeployqt" PRIVATE
SECTION "Deployment" SECTION "Deployment"
LABEL "Android deployment tool" LABEL "Android deployment tool"
PURPOSE "The Android deployment tool automates the process of creating Android packages." PURPOSE "The Android deployment tool automates the process of creating Android packages."
CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression) CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
qt_feature("macdeployqt" PRIVATE qt_feature("macdeployqt" PRIVATE
SECTION "Deployment" SECTION "Deployment"