summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-13 03:05:18 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-13 03:05:18 +0200
commitd895829904a1de3f8a63d5ab56e73106847fddcf (patch)
tree91edd728eccb4aa1c1457e16a0cd357002a058e2
parentf625019aef6dd336ead142d61ed480469c8711ee (diff)
parent3c347ac61ef444a0246921a58a51ccec6bab7413 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
-rw-r--r--src/imports/imports.pro7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 5e701f3..feeb9f1 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -7,15 +7,12 @@ QT += qml quick webview-private
SOURCES += \
$$PWD/webview.cpp
-QMLDIR_CONT = \
+DYNAMIC_QMLDIR = \
"module QtWebView" \
"plugin declarative_webview" \
"typeinfo plugins.qmltypes" \
"classname QWebViewModule"
-qtHaveModule(webengine):QMLDIR_CONT += "depends QtWebEngine 1.0"
-
-QMLDIR_FILE = $$_PRO_FILE_PWD_/qmldir
-write_file($$QMLDIR_FILE, QMLDIR_CONT)|error("Aborting.")
+qtHaveModule(webengine):DYNAMIC_QMLDIR += "depends QtWebEngine 1.0"
load(qml_plugin)
OTHER_FILES += qmldir