diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-12 14:00:25 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-12 13:54:40 +0000 |
commit | f035238d176f64126d78e41a00df351e12c01f3d (patch) | |
tree | dd75306f8c8f8ac39a9e7b2dfdd2af53dd744722 | |
parent | 9fd84eaaa051ec66dbb8ae835f76eea7d4006931 (diff) |
PySide6: Clean list of essential modules
Out of the extras modules, only WinExtras will likely
make it into Qt 6.1.
Change-Id: I4738642674ab8ca86061acc74b45c94961e41aef
Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r-- | sources/cmake_helpers/helpers.cmake | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index 49a73af2b..98a74251a 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -11,15 +11,6 @@ set(ALL_ESSENTIAL_MODULES Network Test Concurrent) -if(UNIX AND NOT APPLE) - list(APPEND ALL_ESSENTIAL_MODULES X11Extras) -endif() -if(WIN32) - list(APPEND ALL_ESSENTIAL_MODULES WinExtras) -endif() -if(APPLE) - list(APPEND ALL_ESSENTIAL_MODULES MacExtras) -endif() endmacro() macro(collect_optional_modules) @@ -59,6 +50,9 @@ list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngine WebEngineWid if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() +if(WIN32) + list(APPEND ALL_OPTIONAL_MODULES WinExtras) +endif() endmacro() macro(check_os) |