diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-08-13 15:37:48 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-08-13 16:09:42 +0200 |
| commit | 83603fed574fc7b0eed452b347170862b12a98f6 (patch) | |
| tree | 4256b22f0f651ab3307167503adf8e417270948f | |
| parent | d0b68335d7eee53c0d2cfa7f1c67e5adc7bab32a (diff) | |
WebView: Make QtWebView depend on WebEngine found
- Make QtWebView depend on WebEngineCore and WebEngineQuick when
building for Windows or Linux.
- Additionally, fix the dependency to not target APPLE.
Pick-to: 6.5 6.7
Change-Id: Idfa17ef2ab290cc7ca08364a3e4a98d171f10324
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/QtWebView/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside6/cmake/PySideHelpers.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtWebView/CMakeLists.txt b/sources/pyside6/PySide6/QtWebView/CMakeLists.txt index 974c3bf3b..158c720c9 100644 --- a/sources/pyside6/PySide6/QtWebView/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebView/CMakeLists.txt @@ -25,7 +25,7 @@ set(QtWebView_libraries pyside6 set(QtWebView_deps QtGui) # for Windows and Linux, QtWebView depends on QtWebEngine to render content -if (WIN32 OR UNIX) +if ((WIN32 OR UNIX) AND NOT APPLE) list(APPEND QtWebView_deps QtWebEngineCore QtWebEngineQuick) endif() diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake index 265917124..ba066c9e6 100644 --- a/sources/pyside6/cmake/PySideHelpers.cmake +++ b/sources/pyside6/cmake/PySideHelpers.cmake @@ -129,7 +129,12 @@ macro(collect_optional_modules) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets - WebEngineQuick WebSockets HttpServer WebView) + WebEngineQuick WebSockets HttpServer) + # for Windows and Linux, QtWebView depends on QtWebEngine to render content + if ((WIN32 OR UNIX) AND NOT APPLE AND Qt${QT_MAJOR_VERSION}WebEngineCore_FOUND AND + Qt${QT_MAJOR_VERSION}WebEngineQuick_FOUND) + list(APPEND ALL_OPTIONAL_MODULES WebView) + endif() list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endmacro() |