diff options
| author | Ulf Hermann <[email protected]> | 2024-01-30 16:42:34 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2024-02-02 10:27:23 +0000 |
| commit | eb3e2e578995c793cb46fa63a82b683adfb1c8a5 (patch) | |
| tree | aaf4064bddc74c60af0180d1f5bc602e3e131064 | |
| parent | d7e5f67861ded32daed9224c7b3f97d5d3687ef4 (diff) | |
WebViewQuick: Fix QML module
The module depends on QtQuick because WebView is derived from
QQuickItem. It should also forward its version to the QtWebEngine
dependency (for consistency; it makes no functional difference) and it
should not force pointless plugin loading.
Pick-to: 6.6 6.5
Fixes: QTBUG-112346
Change-Id: I57656e1fa064fbe0b57ae9ea9e204770ff709a59
Reviewed-by: Fabian Kosmale <[email protected]>
(cherry picked from commit b0efb7b30efcfec857964c65a3930b619422e41e)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
| -rw-r--r-- | src/quick/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 09c1653..b8f8ce9 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -3,7 +3,7 @@ if(TARGET Qt::WebEngineQuick) - set(qmlDependency DEPENDENCIES "QtWebEngine/2.0") + set(qmlDependency "QtWebEngine/auto") endif() qt_internal_add_qml_module(WebViewQuick @@ -11,8 +11,9 @@ qt_internal_add_qml_module(WebViewQuick VERSION "${PROJECT_VERSION}" CLASS_NAME QWebViewQuickPlugin PLUGIN_TARGET qtwebviewquickplugin - NO_PLUGIN_OPTIONAL - ${qmlDependency} + DEPENDENCIES + QtQuick/auto + ${qmlDependency} SOURCES qquickviewcontroller.cpp qquickviewcontroller_p.h qquickwebview.cpp qquickwebview_p.h |