diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:50:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:50:49 +0100 |
| commit | 0218b63446186b659333bd3cbfd6f69ed172299b (patch) | |
| tree | 4265eef4296c0d162b355fd3bb8a0ce90e0ee0bf | |
| parent | d7b2a1d245d7f22514c251a424d699bc5bb2c39e (diff) | |
| parent | 241fe52ae9531f7fad0a5ca1af0bda5a1e5724c7 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I7dee6346e8c163b4c6b6cf0af579b562be99e8d4
| -rw-r--r-- | src/imports/imports.pro | 9 | ||||
| -rw-r--r-- | src/imports/qmldir | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 84fe775..eefb3eb 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -7,6 +7,15 @@ QT += qml quick webview-private SOURCES += \ $$PWD/webview.cpp +QMLDIR_CONT = \ + "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.") load(qml_plugin) OTHER_FILES += qmldir diff --git a/src/imports/qmldir b/src/imports/qmldir deleted file mode 100644 index d8d92f3..0000000 --- a/src/imports/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module QtWebView -plugin declarative_webview -typeinfo plugins.qmltypes -classname QWebViewModule |