diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/.gitattributes | 2 | ||||
| -rw-r--r-- | src/imports/.gitignore | 2 | ||||
| -rw-r--r-- | src/imports/webview.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/webengine/webengine.pro | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1659af5..d4aef77 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.11.2 +MODULE_VERSION = 5.12.0 diff --git a/src/imports/.gitattributes b/src/imports/.gitattributes new file mode 100644 index 0000000..3b71b25 --- /dev/null +++ b/src/imports/.gitattributes @@ -0,0 +1,2 @@ +.gitignore export-ignore +.gitattributes export-ignore diff --git a/src/imports/.gitignore b/src/imports/.gitignore new file mode 100644 index 0000000..af54508 --- /dev/null +++ b/src/imports/.gitignore @@ -0,0 +1,2 @@ +# Created during builds: +/qmldir diff --git a/src/imports/webview.cpp b/src/imports/webview.cpp index ca10e29..792d7fa 100644 --- a/src/imports/webview.cpp +++ b/src/imports/webview.cpp @@ -40,13 +40,6 @@ #include <QtWebView/private/qquickwebviewloadrequest_p.h> #include <QtWebView/private/qquickwebview_p.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtWebView); -#endif -} - QT_BEGIN_NAMESPACE class QWebViewModule : public QQmlExtensionPlugin @@ -54,7 +47,7 @@ class QWebViewModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QWebViewModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QWebViewModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebView")); diff --git a/src/plugins/webengine/webengine.pro b/src/plugins/webengine/webengine.pro index b0a03ac..9257ac0 100644 --- a/src/plugins/webengine/webengine.pro +++ b/src/plugins/webengine/webengine.pro @@ -4,7 +4,7 @@ PLUGIN_TYPE = webview PLUGIN_CLASS_NAME = QWebEngineWebViewPlugin load(qt_plugin) -QT += core gui webengine-private webview-private +QT += core gui webengine-private webenginecore-private webview-private HEADERS += \ qwebenginewebview_p.h |