Merge remote-tracking branch 'origin/5.11.0' into wip/webassembly

Change-Id: Ice58db1687c0cfbd5a19e84ca9fa81b8d3fa7959

26 files changed, 131 insertions, 37 deletions

diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index 5fb68d15d9..53c5300685 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.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 -builtins'
+// 'qmlplugindump -builtins'
 
 Module {
     dependencies: []
@@ -427,7 +427,8 @@ Module {
                 "WA_MacNoShadow": 127,
                 "WA_AlwaysStackOnTop": 128,
                 "WA_TabletTracking": 129,
-                "WA_AttributeCount": 130
+                "WA_ContentsMarginsRespectsSafeArea": 130,
+                "WA_AttributeCount": 131
             }
         }
         Enum {
@@ -760,6 +761,36 @@ Module {
                 "Key_Dead_Belowdot": 16781920,
                 "Key_Dead_Hook": 16781921,
                 "Key_Dead_Horn": 16781922,
+                "Key_Dead_Stroke": 16781923,
+                "Key_Dead_Abovecomma": 16781924,
+                "Key_Dead_Abovereversedcomma": 16781925,
+                "Key_Dead_Doublegrave": 16781926,
+                "Key_Dead_Belowring": 16781927,
+                "Key_Dead_Belowmacron": 16781928,
+                "Key_Dead_Belowcircumflex": 16781929,
+                "Key_Dead_Belowtilde": 16781930,
+                "Key_Dead_Belowbreve": 16781931,
+                "Key_Dead_Belowdiaeresis": 16781932,
+                "Key_Dead_Invertedbreve": 16781933,
+                "Key_Dead_Belowcomma": 16781934,
+                "Key_Dead_Currency": 16781935,
+                "Key_Dead_a": 16781952,
+                "Key_Dead_A": 16781953,
+                "Key_Dead_e": 16781954,
+                "Key_Dead_E": 16781955,
+                "Key_Dead_i": 16781956,
+                "Key_Dead_I": 16781957,
+                "Key_Dead_o": 16781958,
+                "Key_Dead_O": 16781959,
+                "Key_Dead_u": 16781960,
+                "Key_Dead_U": 16781961,
+                "Key_Dead_Small_Schwa": 16781962,
+                "Key_Dead_Capital_Schwa": 16781963,
+                "Key_Dead_Greek": 16781964,
+                "Key_Dead_Lowline": 16781968,
+                "Key_Dead_Aboveverticalline": 16781969,
+                "Key_Dead_Belowverticalline": 16781970,
+                "Key_Dead_Longsolidusoverlay": 16781971,
                 "Key_Back": 16777313,
                 "Key_Forward": 16777314,
                 "Key_Stop": 16777315,
@@ -1348,6 +1379,8 @@ Module {
                 "ImhTime": 256,
                 "ImhPreferLatin": 512,
                 "ImhMultiLine": 1024,
+                "ImhNoEditMenu": 2048,
+                "ImhNoTextHandles": 4096,
                 "ImhDigitsOnly": 65536,
                 "ImhFormattedNumbersOnly": 131072,
                 "ImhUppercaseOnly": 262144,
@@ -1374,6 +1407,8 @@ Module {
                 "ImhTime": 256,
                 "ImhPreferLatin": 512,
                 "ImhMultiLine": 1024,
+                "ImhNoEditMenu": 2048,
+                "ImhNoTextHandles": 4096,
                 "ImhDigitsOnly": 65536,
                 "ImhFormattedNumbersOnly": 131072,
                 "ImhUppercaseOnly": 262144,
diff --git a/src/imports/layouts/layouts.pro b/src/imports/layouts/layouts.pro
index 26574150de..addf396746 100644
--- a/src/imports/layouts/layouts.pro
+++ b/src/imports/layouts/layouts.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qquicklayoutsplugin
 TARGETPATH = QtQuick/Layouts
-IMPORT_VERSION = 1.2
+IMPORT_VERSION = 1.$$QT_MINOR_VERSION
 
 QT *= qml-private quick-private gui-private core-private
 
diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp
index 25d5bacc90..c805c9fb43 100644
--- a/src/imports/layouts/plugin.cpp
+++ b/src/imports/layouts/plugin.cpp
@@ -75,6 +75,9 @@ public:
         qmlRegisterUncreatableType<QQuickLayout>(uri, 1, 2, "Layout",
                                                            QStringLiteral("Do not create objects of type Layout"));
         qmlRegisterRevision<QQuickGridLayoutBase, 1>(uri, 1, 1);
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
     }
 };
 //![class decl]
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index 15753263b8..2fc976d37d 100644
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qmllocalstorageplugin
 TARGETPATH = QtQuick/LocalStorage
-IMPORT_VERSION = 2.0
+IMPORT_VERSION = 2.$${QT_MINOR_VERSION}
 
 QT = sql qml-private  core-private
 
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 88121df66c..9cca11ac5d 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -523,7 +523,7 @@ through the data.
 
 
 /*!
-    \qmlmodule QtQuick.LocalStorage 2
+    \qmlmodule QtQuick.LocalStorage 2.11
     \title Qt Quick Local Storage QML Types
     \ingroup qmlmodules
     \brief Provides a JavaScript object singleton type for accessing a local
@@ -820,6 +820,9 @@ public:
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.LocalStorage"));
         qmlRegisterSingletonType<QQuickLocalStorage>(uri, 2, 0, "LocalStorage", module_api_factory);
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
index dee81a78d0..412989c001 100644
--- a/src/imports/localstorage/plugins.qmltypes
+++ b/src/imports/localstorage/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 -noforceqtquick QtQuick.LocalStorage 2.0'
+// 'qmlplugindump -nonrelocatable QtQuick.LocalStorage 2.11'
 
 Module {
     dependencies: []
diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro
index c94ba833ad..fc87533cea 100644
--- a/src/imports/models/models.pro
+++ b/src/imports/models/models.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = modelsplugin
 TARGETPATH = QtQml/Models.2
-IMPORT_VERSION = 2.3
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 SOURCES += \
     plugin.cpp
diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp
index 2f8a9713d2..83f8597408 100644
--- a/src/imports/models/plugin.cpp
+++ b/src/imports/models/plugin.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 
 #include <private/qqmlmodelsmodule_p.h>
 
@@ -51,7 +52,7 @@ static void initResources()
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlmodule QtQml.Models 2.2
+    \qmlmodule QtQml.Models 2.11
     \title Qt QML Models QML Types
     \ingroup qmlmodules
     \brief Provides QML types for data models
@@ -62,7 +63,7 @@ QT_BEGIN_NAMESPACE
     To use the types in this module, import the module with the following line:
 
     \code
-    import QtQml.Models 2.2
+    import QtQml.Models 2.11
     \endcode
 
     Note that QtQml.Models module started at version 2.1 to match the version
@@ -83,6 +84,9 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQml.Models"));
         Q_UNUSED(uri);
         QQmlModelsModule::defineModule();
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
     }
 };
 //![class decl]
diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes
index e6d09b76d6..60146f51ba 100644
--- a/src/imports/models/plugins.qmltypes
+++ b/src/imports/models/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 -noforceqtquick QtQml.Models 2.3'
+// 'qmlplugindump -nonrelocatable QtQml.Models 2.11'
 
 Module {
     dependencies: []
@@ -19,6 +19,15 @@ Module {
                 "HorizontalSortHint": 2
             }
         }
+        Enum {
+            name: "CheckIndexOption"
+            values: {
+                "NoOption": 0,
+                "IndexIsValid": 1,
+                "DoNotUseParent": 2,
+                "ParentIsInvalid": 4
+            }
+        }
         Signal {
             name: "dataChanged"
             Parameter { name: "topLeft"; type: "QModelIndex" }
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 4460d03a04..41146c75b0 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = particlesplugin
 TARGETPATH = QtQuick/Particles.2
-IMPORT_VERSION = 2.0
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 SOURCES += \
     plugin.cpp
diff --git a/src/imports/particles/plugin.cpp b/src/imports/particles/plugin.cpp
index a04e115976..d548f26599 100644
--- a/src/imports/particles/plugin.cpp
+++ b/src/imports/particles/plugin.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 
 #include <private/qquickparticlesmodule_p.h>
 
@@ -62,6 +63,9 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Particles"));
         Q_UNUSED(uri);
         QQuickParticlesModule::defineModule();
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
     }
 };
 //![class decl]
diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro
index 05ef15a542..8804c944e7 100644
--- a/src/imports/qtqml/qtqml.pro
+++ b/src/imports/qtqml/qtqml.pro
@@ -1,5 +1,5 @@
 TARGETPATH = QtQml
-QML_FILES += plugins.qmltypes
+AUX_QML_FILES += plugins.qmltypes
 
 load(qml_module)
 
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 0fce98a212..6f6f1de8c3 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/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 -noforceqtquick QtQuick 2.10'
+// 'qmlplugindump -nonrelocatable QtQuick 2.11'
 
 Module {
     dependencies: []
@@ -19,6 +19,15 @@ Module {
                 "HorizontalSortHint": 2
             }
         }
+        Enum {
+            name: "CheckIndexOption"
+            values: {
+                "NoOption": 0,
+                "IndexIsValid": 1,
+                "DoNotUseParent": 2,
+                "ParentIsInvalid": 4
+            }
+        }
         Signal {
             name: "dataChanged"
             Parameter { name: "topLeft"; type: "QModelIndex" }
@@ -936,14 +945,16 @@ Module {
         name: "QQuickAnimatedImage"
         defaultProperty: "data"
         prototype: "QQuickImage"
-        exports: ["QtQuick/AnimatedImage 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQuick/AnimatedImage 2.0", "QtQuick/AnimatedImage 2.11"]
+        exportMetaObjectRevisions: [0, 11]
         Property { name: "playing"; type: "bool" }
         Property { name: "paused"; type: "bool" }
         Property { name: "currentFrame"; type: "int" }
         Property { name: "frameCount"; type: "int"; isReadonly: true }
+        Property { name: "speed"; revision: 11; type: "double" }
         Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
         Signal { name: "frameChanged" }
+        Signal { name: "speedChanged"; revision: 11 }
     }
     Component {
         name: "QQuickAnimatedSprite"
@@ -1814,6 +1825,9 @@ Module {
     Component {
         name: "QQuickGrabGestureEvent"
         prototype: "QObject"
+        exports: ["QtQuick/GestureEvent 2.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
         Property { name: "touchPoints"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "dragThreshold"; type: "double"; isReadonly: true }
         Method { name: "grab" }
@@ -2118,10 +2132,11 @@ Module {
         exports: [
             "QtQuick/Item 2.0",
             "QtQuick/Item 2.1",
+            "QtQuick/Item 2.11",
             "QtQuick/Item 2.4",
             "QtQuick/Item 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 7]
+        exportMetaObjectRevisions: [0, 1, 11, 2, 7]
         Enum {
             name: "TransformOrigin"
             values: {
@@ -2175,6 +2190,7 @@ Module {
         Property { name: "antialiasing"; type: "bool" }
         Property { name: "implicitWidth"; type: "double" }
         Property { name: "implicitHeight"; type: "double" }
+        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
         Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
         Signal {
             name: "childrenRectChanged"
@@ -2226,6 +2242,7 @@ Module {
             revision: 1
             Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
         }
+        Signal { name: "containmentMaskChanged"; revision: 11 }
         Method { name: "update" }
         Method {
             name: "grabToImage"
@@ -3027,6 +3044,19 @@ Module {
         Signal { name: "changed" }
     }
     Component {
+        name: "QQuickPathAngleArc"
+        prototype: "QQuickCurve"
+        exports: ["QtQuick/PathAngleArc 2.11"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "centerX"; type: "double" }
+        Property { name: "centerY"; type: "double" }
+        Property { name: "radiusX"; type: "double" }
+        Property { name: "radiusY"; type: "double" }
+        Property { name: "startAngle"; type: "double" }
+        Property { name: "sweepAngle"; type: "double" }
+        Property { name: "moveToStart"; type: "bool" }
+    }
+    Component {
         name: "QQuickPathAnimation"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/PathAnimation 2.0"]
@@ -3416,14 +3446,6 @@ Module {
             Parameter { type: "int" }
         }
         Signal {
-            name: "fromChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
-            name: "toChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
             name: "easingChanged"
             Parameter { type: "QEasingCurve" }
         }
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
index 118343588a..01ac034104 100644
--- a/src/imports/qtquick2/qtquick2.pro
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qtquick2plugin
 TARGETPATH = QtQuick.2
-IMPORT_VERSION = 2.6
+IMPORT_VERSION = 2.11
 
 SOURCES += \
     plugin.cpp
diff --git a/src/imports/shapes/qquickshapegenericrenderer.cpp b/src/imports/shapes/qquickshapegenericrenderer.cpp
index 4933aab69e..e3d47430c7 100644
--- a/src/imports/shapes/qquickshapegenericrenderer.cpp
+++ b/src/imports/shapes/qquickshapegenericrenderer.cpp
@@ -607,6 +607,7 @@ void QQuickShapeGenericRenderer::updateFillNode(ShapePathData *d, QQuickShapeGen
             break;
         default:
             Q_UNREACHABLE();
+            return;
         }
         n->activateMaterial(m_item->window(), gradMat);
         if (d->effectiveDirty & DirtyFillGradient) {
diff --git a/src/imports/statemachine/plugin.cpp b/src/imports/statemachine/plugin.cpp
index 1357743126..93ced6e280 100644
--- a/src/imports/statemachine/plugin.cpp
+++ b/src/imports/statemachine/plugin.cpp
@@ -75,6 +75,9 @@ public:
         qmlRegisterCustomType<SignalTransition>(uri, 1, 0, "SignalTransition", new SignalTransitionParser);
         qmlRegisterType<TimeoutTransition>(uri, 1, 0, "TimeoutTransition");
         qmlProtectModule(uri, 1);
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/statemachine/plugins.qmltypes b/src/imports/statemachine/plugins.qmltypes
index 0fe9b63e03..e6ecaa75c8 100644
--- a/src/imports/statemachine/plugins.qmltypes
+++ b/src/imports/statemachine/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 -noforceqtquick QtQml.StateMachine 1.0'
+// 'qmlplugindump -nonrelocatable QtQml.StateMachine 1.11'
 
 Module {
     dependencies: []
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 63a969c0e8..ab625788bb 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -176,9 +176,10 @@ void SignalTransition::connectTriggered()
     QMetaMethod metaMethod = target->metaObject()->method(qobjectSignal->methodIndex());
     int signalIndex = QMetaObjectPrivate::signalIndex(metaMethod);
 
-    QQmlBoundSignalExpression *expression = ctxtdata ?
-                new QQmlBoundSignalExpression(target, signalIndex,
-                                              ctxtdata, this, m_compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex]) : nullptr;
+    auto f = m_compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex];
+    QQmlBoundSignalExpression *expression =
+            ctxtdata ? new QQmlBoundSignalExpression(target, signalIndex, ctxtdata, this, f)
+                     : nullptr;
     if (expression)
         expression->setNotifyOnValueChanged(false);
     m_signalExpression = expression;
diff --git a/src/imports/statemachine/statemachine.pro b/src/imports/statemachine/statemachine.pro
index 9bb88074e9..926a9d4a5e 100644
--- a/src/imports/statemachine/statemachine.pro
+++ b/src/imports/statemachine/statemachine.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET = qtqmlstatemachine
 TARGETPATH = QtQml/StateMachine
-IMPORT_VERSION = 1.0
+IMPORT_VERSION = 1.$$QT_MINOR_VERSION
 
 QT = core-private qml-private
 
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index 45e9bd2cf6..443229bee9 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -160,6 +160,9 @@ public:
         qmlRegisterType<QuickTestEvent>(uri,1,2,"TestEvent");
         qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil");
         qmlRegisterType<QQuickTouchEventSequence>();
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index 6e8a6aee72..acbe82e5e6 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qmltestplugin
 TARGETPATH = QtTest
-IMPORT_VERSION = 1.0
+IMPORT_VERSION = 1.$$QT_MINOR_VERSION
 
 QT += qml quick qmltest qmltest-private  qml-private core-private testlib
 
diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp
index 4e6eedf326..907eecb060 100644
--- a/src/imports/window/plugin.cpp
+++ b/src/imports/window/plugin.cpp
@@ -51,7 +51,7 @@ static void initResources()
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlmodule QtQuick.Window 2.2
+    \qmlmodule QtQuick.Window 2.11
     \title Qt Quick Window QML Types
     \ingroup qmlmodules
     \brief Provides QML types for window management
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
     To use the types in this module, import the module with the following line:
 
     \code
-    import QtQuick.Window 2.2
+    import QtQuick.Window 2.11
     \endcode
 */
 
@@ -78,6 +78,9 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Window"));
         Q_UNUSED(uri);
         QQuickWindowModule::defineModule();
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
     }
 };
 //![class decl]
diff --git a/src/imports/window/window.pro b/src/imports/window/window.pro
index a938e0eeef..77bd9518e9 100644
--- a/src/imports/window/window.pro
+++ b/src/imports/window/window.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = windowplugin
 TARGETPATH = QtQuick/Window.2
-IMPORT_VERSION = 2.2
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 SOURCES += \
     plugin.cpp
diff --git a/src/imports/xmllistmodel/plugin.cpp b/src/imports/xmllistmodel/plugin.cpp
index dc6a02918b..82e11eeeb3 100644
--- a/src/imports/xmllistmodel/plugin.cpp
+++ b/src/imports/xmllistmodel/plugin.cpp
@@ -63,6 +63,9 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.XmlListModel"));
         qmlRegisterType<QQuickXmlListModel>(uri,2,0,"XmlListModel");
         qmlRegisterType<QQuickXmlListModelRole>(uri,2,0,"XmlRole");
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+        qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index d14810a01b..a08b59a598 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -72,7 +72,7 @@ typedef QPair<int, int> QQuickXmlListRange;
 #define XMLLISTMODEL_CLEAR_ID 0
 
 /*!
-    \qmlmodule QtQuick.XmlListModel 2
+    \qmlmodule QtQuick.XmlListModel 2.11
     \title Qt Quick XmlListModel QML Types
     \ingroup qmlmodules
     \brief Provides QML types for creating models from XML data
@@ -82,7 +82,7 @@ typedef QPair<int, int> QQuickXmlListRange;
     To use the types in this module, import the module with the following line:
 
     \code
-    import QtQuick.XmlListModel 2.0
+    import QtQuick.XmlListModel 2.11
     \endcode
 */
 
diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro
index 2308f26d1b..b5f559fc93 100644
--- a/src/imports/xmllistmodel/xmllistmodel.pro
+++ b/src/imports/xmllistmodel/xmllistmodel.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qmlxmllistmodelplugin
 TARGETPATH = QtQuick/XmlListModel
-IMPORT_VERSION = 2.0
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT = network xmlpatterns qml-private  core-private