From 74c8ebe9696c981311f19bdd6544634ab1b7cc7f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 11 Apr 2019 11:47:11 +0200 Subject: Automatically register the latest import version This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: I3a2232d5f7418ec99441a71fb70d88835dc61a61 Reviewed-by: Ulf Hermann --- src/imports/qmlwebsockets/plugins.qmltypes | 2 +- src/imports/qmlwebsockets/qmlwebsockets.pro | 2 +- src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/imports') 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(uri, 1 /*major*/, 0 /*minor*/, "WebSocket"); qmlRegisterType(uri, 1 /*major*/, 1 /*minor*/, "WebSocket"); qmlRegisterType(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 -- cgit v1.2.1