diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-07-24 12:59:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-08-01 12:12:46 +0200 |
| commit | 34f1902161ff5f39fd274ce1c7b8ef5e3edbb2bb (patch) | |
| tree | ad4707fd4447c556745d1a4ea6564ceba80406c3 /sources/pyside6/cmake/PySideHelpers.cmake | |
| parent | 7c96fc9f8953c624fdd6530e4088d8fa59db04ce (diff) | |
Enable DBus/HttpServer on Windows
There was a comment about a clash of macro DELETE in Windows
headers with some enumeration that was apparently renamed.
Pick-to: 6.5
Fixes: PYSIDE-2402
Change-Id: I32d6da712a3388059cbbc0181f565ebfb82bd45c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/cmake/PySideHelpers.cmake')
| -rw-r--r-- | sources/pyside6/cmake/PySideHelpers.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake index 5dd1fc69f..c728e7c43 100644 --- a/sources/pyside6/cmake/PySideHelpers.cmake +++ b/sources/pyside6/cmake/PySideHelpers.cmake @@ -86,6 +86,7 @@ endmacro() macro(collect_optional_modules) # Collect all optional modules. set(ALL_OPTIONAL_MODULES + DBus Designer Xml Help Multimedia @@ -127,12 +128,7 @@ macro(collect_optional_modules) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets - WebEngineQuick WebSockets) - if(NOT WIN32) - # FIXME: Move to global once DELETE define clash is resolved. - list(APPEND ALL_OPTIONAL_MODULES HttpServer) - list(APPEND ALL_OPTIONAL_MODULES DBus) - endif() + WebEngineQuick WebSockets HttpServer) list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endmacro() |