diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/imports.pro | 9 | ||||
| -rw-r--r-- | src/imports/qmldir | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index aae5d51..94f38f6 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.8.0 +MODULE_VERSION = 5.8.1 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 |