diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-07-01 08:32:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-07-01 14:35:59 +0200 |
| commit | d98d47e5bc7d04fe80966cf9396cf2fdc2414a1a (patch) | |
| tree | d99046d814b522b0479538f2d85d32134354c824 /sources | |
| parent | 2eea860f88a6e6f5be10a6097733f4e676af3717 (diff) | |
Add dependency to the QtHttpServer module
Amends 7eb12e4cd3be60b4aaf18530d0c927bef386e913.
Exclude it for Windows currently due to a clash
with winnt.h defining a DELETE macro.
Change-Id: I47f2dea77991e74e00cd8fdc3de6ef5f850d4386
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside6/cmake/PySideHelpers.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake index 176623cb2..0044262cb 100644 --- a/sources/pyside6/cmake/PySideHelpers.cmake +++ b/sources/pyside6/cmake/PySideHelpers.cmake @@ -86,7 +86,6 @@ macro(collect_optional_modules) Designer Xml Help Multimedia - HttpServer MultimediaWidgets OpenGL OpenGLWidgets @@ -122,6 +121,8 @@ macro(collect_optional_modules) 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() if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 6.0.2) |