diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:02:51 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:02:51 +0200 |
commit | 6dd15c9f1bfdc010e4cd4b8158435063a5a7d229 (patch) | |
tree | fee52a5b7934d40eb242d4c8ccac52cead86ee45 /src | |
parent | 0a7edabaac66481fd7f92b0a276d211ad9339f20 (diff) | |
parent | 74c8ebe9696c981311f19bdd6544634ab1b7cc7f (diff) | |
download | qtwebsockets-6dd15c9f1bfdc010e4cd4b8158435063a5a7d229.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I43320389826b0f0deac412bf37df9232f2e68a33
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/qmlwebsockets/qmlwebsockets.pro | 2 | ||||
-rw-r--r-- | src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | 3 | ||||
-rw-r--r-- | src/websockets/doc/src/index.qdoc | 6 | ||||
-rw-r--r-- | src/websockets/doc/src/qtwebsockets-module.qdoc | 8 |
5 files changed, 12 insertions, 9 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index 4f39a36..79e2f97 100644 --- a/src/imports/qmlwebsockets/plugins.qmltypes +++ b/src/imports/qmlwebsockets/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 QtWebSockets 1.1' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.13' Module { dependencies: [] diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro index 7b6fc86..c058918 100644 --- a/src/imports/qmlwebsockets/qmlwebsockets.pro +++ b/src/imports/qmlwebsockets/qmlwebsockets.pro @@ -12,6 +12,6 @@ SOURCES += qmlwebsockets_plugin.cpp \ OTHER_FILES += qmldir -IMPORT_VERSION = 1.1 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION load(qml_plugin) diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp index 24fe34a..467e08c 100644 --- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp +++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp @@ -55,6 +55,9 @@ void QtWebSocketsDeclarativeModule::registerTypes(const char *uri) qmlRegisterType<QQmlWebSocket>(uri, 1 /*major*/, 0 /*minor*/, "WebSocket"); qmlRegisterType<QQmlWebSocket, 1>(uri, 1 /*major*/, 1 /*minor*/, "WebSocket"); qmlRegisterType<QQmlWebSocketServer>(uri, 1 /*major*/, 0 /*minor*/, "WebSocketServer"); + + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions + qmlRegisterModule(uri, 1, QT_VERSION_MINOR); } QT_END_NAMESPACE diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc index c23f6fe..81a2cb4 100644 --- a/src/websockets/doc/src/index.qdoc +++ b/src/websockets/doc/src/index.qdoc @@ -51,9 +51,9 @@ To import the QML types into your application, use the following import statement in your .qml file: - \code - import QtWebSockets 1.0 - \endcode + \qml \QtMinorVersion + import QtWebSockets 1.\1 + \endqml To link against the module, add this line to your qmake .pro file: diff --git a/src/websockets/doc/src/qtwebsockets-module.qdoc b/src/websockets/doc/src/qtwebsockets-module.qdoc index c1f7958..83c561d 100644 --- a/src/websockets/doc/src/qtwebsockets-module.qdoc +++ b/src/websockets/doc/src/qtwebsockets-module.qdoc @@ -48,16 +48,16 @@ */ /*! - \qmlmodule QtWebSockets 1.1 + \qmlmodule QtWebSockets 1.\QtMinorVersion \title Qt WebSockets QML Types \ingroup qmlmodules \brief Provides QML types for WebSocket-based communication. The QML types are accessed by using: - \code - import QtWebSockets 1.1 - \endcode + \qml \QtMinorVersion + import QtWebSockets 1.\1 + \endqml \note Prior to Qt 5.5, the import statement was \c{import Qt.WebSockets 1.0} (notice the dot between \c Qt and \c WebSockets). The old statement is still |