diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-26 17:03:49 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 14:05:44 +0000 |
| commit | bad392cc1954faf3b7c16aa9dfa72ca5d6b20219 (patch) | |
| tree | 12229530c3c75e7ea8d58466d3b642d5a80f1b89 /src | |
| parent | a68a8d0535d4951f6156bc2597bc4281d46fd6fd (diff) | |
Remove the code to manually initialize resources in static builds
After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is
not needed anymore. Instead the resource system injects the plugin entry
point with a reference to all resources.
Change-Id: I8507b0b9bf36371bd1e5c004e792bee3177432fd
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/webview.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
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")); |