diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:03:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:03:40 +0200 |
| commit | aa490ada3793fc3528bdfefb90479c711cc0c325 (patch) | |
| tree | 0f917066b1d8b70950e00f4b2265253d97578540 | |
| parent | b4342f3567ec08a959f132bc1ef0c4f8eb89bcf8 (diff) | |
| parent | 24e0c897fac375514396191db7b582505028c918 (diff) | |
| download | qtwebchannel-aa490ada3793fc3528bdfefb90479c711cc0c325.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I8b70f062015311e0e3827fe001155d6ce1e146d2
| -rw-r--r-- | src/imports/webchannel/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/imports/webchannel/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/webchannel/webchannel.pro | 2 | ||||
| -rw-r--r-- | src/webchannel/doc/src/index.qdoc | 6 | ||||
| -rw-r--r-- | src/webchannel/doc/src/module.qdoc | 8 |
5 files changed, 12 insertions, 9 deletions
diff --git a/src/imports/webchannel/plugin.cpp b/src/imports/webchannel/plugin.cpp index 1abf648..b6d4018 100644 --- a/src/imports/webchannel/plugin.cpp +++ b/src/imports/webchannel/plugin.cpp @@ -60,6 +60,9 @@ void QWebChannelPlugin::registerTypes(const char *uri) int major = 1; int minor = 0; qmlRegisterType<QQmlWebChannel>(uri, major, minor, "WebChannel"); + + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions + qmlRegisterModule(uri, major, QT_VERSION_MINOR); } QT_END_NAMESPACE diff --git a/src/imports/webchannel/plugins.qmltypes b/src/imports/webchannel/plugins.qmltypes index c138386..76cf5e4 100644 --- a/src/imports/webchannel/plugins.qmltypes +++ b/src/imports/webchannel/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebChannel 1.0' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebChannel 1.13' Module { dependencies: [] diff --git a/src/imports/webchannel/webchannel.pro b/src/imports/webchannel/webchannel.pro index 4c8d322..fd69605 100644 --- a/src/imports/webchannel/webchannel.pro +++ b/src/imports/webchannel/webchannel.pro @@ -3,7 +3,7 @@ QT = core quick webchannel-private INCLUDEPATH += ../../webchannel VPATH += ../../webchannel -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION SOURCES += \ plugin.cpp diff --git a/src/webchannel/doc/src/index.qdoc b/src/webchannel/doc/src/index.qdoc index 439c4a3..17f6d15 100644 --- a/src/webchannel/doc/src/index.qdoc +++ b/src/webchannel/doc/src/index.qdoc @@ -59,9 +59,9 @@ \endcode The QML types are accessed by using: - \badcode - import QtWebChannel 1.0 - \endcode + \qml \QtMinorVersion + import QtWebChannel 1.\1 + \endqml \section1 Licenses diff --git a/src/webchannel/doc/src/module.qdoc b/src/webchannel/doc/src/module.qdoc index 1462609..1a46b3c 100644 --- a/src/webchannel/doc/src/module.qdoc +++ b/src/webchannel/doc/src/module.qdoc @@ -48,13 +48,13 @@ */ /*! - \qmlmodule QtWebChannel 1.0 + \qmlmodule QtWebChannel 1.\QtMinorVersion \title Qt WebChannel QML Types \since 5.4 \brief List of QML types that provide WebChannel functionality. The QML types are accessed by using: - \badcode - import QtWebChannel 1.0 - \endcode + \qml \QtMinorVersion + import QtWebChannel 1.\1 + \endqml */ |