11 files changed, 30 insertions, 20 deletions
diff --git a/src/import/import.pro b/src/import/import.pro
index c1045ffc..297efde4 100644
--- a/src/import/import.pro
+++ b/src/import/import.pro
@@ -1,6 +1,6 @@
 TARGET = qtquickvirtualkeyboardplugin
 TARGETPATH = QtQuick/VirtualKeyboard
-IMPORT_VERSION = 2.4
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 QT += qml quick virtualkeyboard-private
 
 CONFIG += no_cxx_module
diff --git a/src/import/plugins.qmltypes b/src/import/plugins.qmltypes
index 6614d9c4..9edd38c8 100644
--- a/src/import/plugins.qmltypes
+++ b/src/import/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 -defaultplatform -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard 2.4'
+// 'qmlplugindump -defaultplatform -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard 2.13'
 
 Module {
     dependencies: [
@@ -39,6 +39,7 @@ Module {
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "animating"; type: "bool" }
         Property { name: "locale"; type: "string"; isReadonly: true }
+        Property { name: "inputItem"; type: "QObject"; isReadonly: true; isPointer: true }
         Property {
             name: "inputEngine"
             type: "QVirtualKeyboardInputEngine"
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp
index 969884c2..9fa769e8 100644
--- a/src/import/qtquickvirtualkeyboardplugin.cpp
+++ b/src/import/qtquickvirtualkeyboardplugin.cpp
@@ -147,6 +147,9 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri)
 
     // New revisions in 5.12.
     qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 2, 4, "InputContext", createInputContextModule);
+
+    // 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/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
diff --git a/src/styles/plugins.qmltypes b/src/styles/plugins.qmltypes
index 04aa6867..d23105b2 100644
--- a/src/styles/plugins.qmltypes
+++ b/src/styles/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 QtQuick.VirtualKeyboard.Styles 2.2'
+// 'qmlplugindump -nonrelocatable QtQuick.VirtualKeyboard.Styles 2.13'
 
 Module {
     dependencies: ["QtQuick 2.0"]
diff --git a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
index f090974e..c52525aa 100644
--- a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
+++ b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
@@ -37,7 +37,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlmodule QtQuick.VirtualKeyboard.Styles 2.2
+    \qmlmodule QtQuick.VirtualKeyboard.Styles 2.\QtMinorVersion
     \title Qt Quick Virtual Keyboard Styles QML Types
     \ingroup qmlmodules
 
@@ -46,9 +46,9 @@ QT_BEGIN_NAMESPACE
     The QML types can be imported into your application using the following
     import statements in your .qml file:
 
-    \code
-    import QtQuick.VirtualKeyboard.Styles 2.2
-    \endcode
+    \qml \QtMinorVersion
+    import QtQuick.VirtualKeyboard.Styles 2.\1
+    \endqml
 */
 
 void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
@@ -73,6 +73,9 @@ void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
     qmlRegisterType(QUrl(path + QLatin1String("SelectionListItem.qml")), uri, 2, 0, "SelectionListItem");
     qmlRegisterType(QUrl(path + QLatin1String("TraceInputKeyPanel.qml")), uri, 2, 0, "TraceInputKeyPanel");
     qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 2, 0, "TraceCanvas");
+
+    // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+    qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
 }
 
 void QtQuickVirtualKeyboardStylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/src/styles/styles.pro b/src/styles/styles.pro
index aa7280e2..5d79fd9e 100644
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -1,6 +1,6 @@
 TARGET = qtquickvirtualkeyboardstylesplugin
 TARGETPATH = QtQuick/VirtualKeyboard/Styles
-IMPORT_VERSION = 2.2
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 QT += qml quick svg virtualkeyboard-private
 
 CONFIG += no_cxx_module
diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
index 353afe6d..a3156cd0 100644
--- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
+++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
@@ -109,7 +109,7 @@
 */
 
 /*!
-\qmlmodule QtQuick.VirtualKeyboard 2.4
+\qmlmodule QtQuick.VirtualKeyboard 2.\QtMinorVersion
 \title Qt Virtual Keyboard QML Types
 \ingroup qmlmodules
 \brief Provides QML types for an input framework and a reference keyboard front
@@ -118,11 +118,11 @@ end.
     The QML types can be imported into your application using the following
     import statements in your .qml file:
 
-    \code
-    import QtQuick.VirtualKeyboard 2.4
-    import QtQuick.VirtualKeyboard.Styles 2.2
-    import QtQuick.VirtualKeyboard.Settings 2.2
-    \endcode
+    \qml \QtMinorVersion
+    import QtQuick.VirtualKeyboard 2.\1
+    import QtQuick.VirtualKeyboard.Styles 2.\1
+    import QtQuick.VirtualKeyboard.Settings 2.\1
+    \endqml
 
     In addition to importing the types, the \c QT_IM_MODULE environment
     variable must be set to \c qtvirtualkeyboard. For more information, see
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index 5f9e82f0..d415c36c 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -95,7 +95,7 @@ public:
 };
 
 /*!
-    \qmlmodule QtQuick.VirtualKeyboard.Settings 2.2
+    \qmlmodule QtQuick.VirtualKeyboard.Settings 2.\QtMinorVersion
     \title Qt Quick Virtual Keyboard Settings QML Types
     \ingroup qmlmodules
 
@@ -104,9 +104,9 @@ public:
     The QML types can be imported into your application using the following
     import statements in your .qml file:
 
-    \code
-    import QtQuick.VirtualKeyboard.Settings 2.2
-    \endcode
+    \qml \QtMinorVersion
+    import QtQuick.VirtualKeyboard.Settings 2.\1
+    \endqml
 */
 
 /*!