diff options
| author | Alexey Edelev <[email protected]> | 2023-11-02 17:29:53 +0100 |
|---|---|---|
| committer | Alexey Edelev <[email protected]> | 2023-11-04 08:01:35 +0100 |
| commit | f2bb22b541b49e2a899062051f0774cc1151b66b (patch) | |
| tree | ebb5fcabe8576ecd913fdaffdab65a4e38d63b2e | |
| parent | b01687581dd8cfe80e06a7936068de7d36443ab1 (diff) | |
Respect QQC2 style related features
Guard respective QML modules with feature-specific conditions.
Move platform-specific conditions to the feature definitions.
Fixes: QTBUG-118738
Pick-to: 6.2 6.5 6.6
Change-Id: I2ff45809982d7c39ecaaae2213f6d85084887b9d
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Mitch Curtis <[email protected]>
| -rw-r--r-- | src/quickcontrols/CMakeLists.txt | 27 | ||||
| -rw-r--r-- | src/quickcontrols/configure.cmake | 6 |
2 files changed, 21 insertions, 12 deletions
diff --git a/src/quickcontrols/CMakeLists.txt b/src/quickcontrols/CMakeLists.txt index 6eff9b10d3..18b170ad82 100644 --- a/src/quickcontrols/CMakeLists.txt +++ b/src/quickcontrols/CMakeLists.txt @@ -67,22 +67,31 @@ if(QT_FEATURE_quick_designer) endif() add_subdirectory(basic) -add_subdirectory(fusion) -add_subdirectory(imagine) -add_subdirectory(material) -add_subdirectory(universal) +if(QT_FEATURE_quickcontrols2_fusion) + add_subdirectory(fusion) +endif() + +if(QT_FEATURE_quickcontrols2_imagine) + add_subdirectory(imagine) +endif() + +if(QT_FEATURE_quickcontrols2_material) + add_subdirectory(material) +endif() + +if(QT_FEATURE_quickcontrols2_universal) + add_subdirectory(universal) +endif() -if(MACOS) +if(QT_FEATURE_quickcontrols2_macos) add_subdirectory(macos) - ### Remove - add_subdirectory(ios) endif() -if(IOS) +if(QT_FEATURE_quickcontrols2_ios) add_subdirectory(ios) endif() -if(WIN32) +if(QT_FEATURE_quickcontrols2_windows) add_subdirectory(windows) endif() diff --git a/src/quickcontrols/configure.cmake b/src/quickcontrols/configure.cmake index e713e73f7c..b146186426 100644 --- a/src/quickcontrols/configure.cmake +++ b/src/quickcontrols/configure.cmake @@ -48,19 +48,19 @@ qt_feature("quickcontrols2-macos" PRIVATE SECTION "Quick Controls 2" LABEL "macOS" PURPOSE "Provides a native macOS desktop style." - CONDITION QT_FEATURE_quickcontrols2_basic + CONDITION QT_FEATURE_quickcontrols2_basic AND MACOS ) qt_feature("quickcontrols2-ios" PRIVATE SECTION "Quick Controls 2" LABEL "iOS" PURPOSE "Provides a native-looking iOS style." - CONDITION QT_FEATURE_quickcontrols2_basic + CONDITION QT_FEATURE_quickcontrols2_basic AND (IOS OR MACOS) ) qt_feature("quickcontrols2-windows" PRIVATE SECTION "Quick Controls 2" LABEL "Windows" PURPOSE "Provides a native Windows desktop style." - CONDITION QT_FEATURE_quickcontrols2_basic + CONDITION QT_FEATURE_quickcontrols2_basic AND WIN32 ) qt_configure_add_summary_section(NAME "Qt Quick Controls 2") qt_configure_add_summary_entry( |