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/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | |
| 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/imports/qmlwebsockets/qmlwebsockets_plugin.cpp')
| -rw-r--r-- | src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |