diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/webchannel/plugin.cpp | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf index 56c0f31..81caa27 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.11.2 +MODULE_VERSION = 5.12.0 diff --git a/src/imports/webchannel/plugin.cpp b/src/imports/webchannel/plugin.cpp index c66f75f..1abf648 100644 --- a/src/imports/webchannel/plugin.cpp +++ b/src/imports/webchannel/plugin.cpp @@ -43,13 +43,6 @@ #include <qqmlwebchannel.h> #include <qqmlwebchannelattached_p.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtWebChannel); -#endif -} - QT_BEGIN_NAMESPACE class QWebChannelPlugin : public QQmlExtensionPlugin @@ -58,7 +51,7 @@ class QWebChannelPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QWebChannelPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QWebChannelPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri); }; |