diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-04-11 12:47:07 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-12 07:56:09 +0000 |
| commit | 67e497ff407441515761b312599cb4ad6b61adad (patch) | |
| tree | 022148c6ca29ed231f0770dad5c419c73f3ebe74 /src/settings | |
| parent | e117cfe3be46ccb82b0b3a9674d65ffb0f49e4df (diff) | |
Automatically register the latest import versionv5.13.0-beta3
This follows what was done in d28c9f6a for Qt Quick Controls 2.
The latest import version (e.g. 2.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: Ic2b59f50bfae8fed5148eae9596578adb0aadb52
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/settings/qtquickvirtualkeyboardsettingsplugin.cpp | 3 | ||||
| -rw-r--r-- | src/settings/settings.pro | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/settings/plugins.qmltypes b/src/settings/plugins.qmltypes index 2278e05c..7ab07b88 100644 --- a/src/settings/plugins.qmltypes +++ b/src/settings/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 QtQuick.VirtualKeyboard.Settings 2.2' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard.Settings 2.13' Module { dependencies: [] diff --git a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp index 131696e1..db572243 100644 --- a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp +++ b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp @@ -48,6 +48,9 @@ void QtQuickVirtualKeyboardSettingsPlugin::registerTypes(const char *uri) qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 2, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); qRegisterMetaType<WordCandidateListSettings *>("WordCandidateListSettings*"); qmlRegisterUncreatableType<WordCandidateListSettings>(uri, 2, 2, "WordCandidateListSettings", QLatin1String("Cannot create word candidate list settings")); + + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); } QT_END_NAMESPACE diff --git a/src/settings/settings.pro b/src/settings/settings.pro index ec5a5147..c4d97c16 100644 --- a/src/settings/settings.pro +++ b/src/settings/settings.pro @@ -1,6 +1,6 @@ TARGET = qtquickvirtualkeyboardsettingsplugin TARGETPATH = QtQuick/VirtualKeyboard/Settings -IMPORT_VERSION = 2.2 +IMPORT_VERSION = 2.$$QT_MINOR_VERSION QT += qml quick virtualkeyboard-private CONFIG += no_cxx_module |