diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-12-22 09:52:31 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-23 10:31:23 +0000 |
| commit | 6ea4c6e34716fd7c16ac5f04dc9877d6757271ef (patch) | |
| tree | f93d8df865a23d907c831ed2bb171f1187e31528 | |
| parent | 12e715c11d292f96b0be5572892d5dc08292934d (diff) | |
Add libraries that supposed to be in rpath to PUBLIC_LIBRARIES
Fixes: QTBUG-99372
Task-number: QTBUG-86533
Change-Id: I24b3d6a02374972536bac6bb6fc6af6167cc8c6d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit dc22798034bbfc4724754bc3cdd79aa7e4c3b5be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quick/CMakeLists.txt | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0192f52..763a794 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(QtWebView ) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Qml Quick +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Qml Quick OpenGL WebEngineCore WebEngineQuick ) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 86a0b8f..8b3e1e4 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -14,9 +14,16 @@ qt_internal_add_qml_module(WebViewQuick qquickviewcontroller.cpp qquickviewcontroller_p.h qquickwebview.cpp qquickwebview_p.h qquickwebviewloadrequest.cpp qquickwebviewloadrequest_p.h + PUBLIC_LIBRARIES # TODO: QTBUG-86533 workaround, PUBLIC_LIBRARIES should be moved to LIBRARIES. + Qt::Quick + Qt::QmlModels LIBRARIES Qt::QuickPrivate Qt::WebViewPrivate ) - + # TODO: QTBUG-86533 workaround, PUBLIC_LIBRARIES should be moved to LIBRARIES. +qt_internal_extend_target(WebViewQuick CONDITION TARGET Qt::OpenGL + PUBLIC_LIBRARIES + Qt::OpenGL +) |