diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.12.0 | 18 | ||||
| -rw-r--r-- | src/imports/webchannel/plugin.cpp | 9 |
3 files changed, 20 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf index 47dc3a9..81caa27 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.11.3 +MODULE_VERSION = 5.12.0 diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 new file mode 100644 index 0000000..4f6c63e --- /dev/null +++ b/dist/changes-5.12.0 @@ -0,0 +1,18 @@ +Qt 5.12 introduces many new features and improvements as well as bugfixes +over the 5.11.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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); }; |