add qmlRegisterModule to all QML plugins (QUIP 99)

Now it should always be possible to do
import QtQuick.Module x.m
where x is the module's major version and m is Qt's minor version.

[ChangeLog][QtQuick][Important Behavior Changes] In Qt 5.11 and newer
versions, QML plugin modules are available with the same minor version
as the Qt release minor version number.  For example it's possible to
import QtQuick.Window 2.11 or import QtQuick.Layouts 1.11
even though there haven't been any API changes in these modules for Qt 5.11,
and the maximum possible import version will automatically increment
in future Qt versions.  This is intended to reduce confusion.

Change-Id: I0d28ed04d186bcdd5acde95b8ed0b66c1c4697e3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

9 files changed, 32 insertions, 0 deletions

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/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 88121df66c..fb71fcaff6 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -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/models/plugin.cpp b/src/imports/models/plugin.cpp
index 2f8a9713d2..fb1d42e85e 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>
 
@@ -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/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/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/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/window/plugin.cpp b/src/imports/window/plugin.cpp
index 4e6eedf326..d8d21ce27e 100644
--- a/src/imports/window/plugin.cpp
+++ b/src/imports/window/plugin.cpp
@@ -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/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/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index ebd354d003..54a7c5130d 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -257,6 +257,9 @@ void QQmlEnginePrivate::defineQtQuick2Module()
     // register the QtQuick2 types which are implemented in the QtQml module.
     registerQtQuick2Types("QtQuick",2,0);
     qmlRegisterUncreatableType<QQmlLocale>("QtQuick", 2, 0, "Locale", QQmlEngine::tr("Locale cannot be instantiated.  Use Qt.locale()"));
+
+    // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
+    qmlRegisterModule("QtQuick", 2, QT_VERSION_MINOR);
 }
 
 bool QQmlEnginePrivate::designerMode()
@@ -956,6 +959,9 @@ void QQmlEnginePrivate::init()
         registerBaseTypes("QtQml", 2, 0); // import which provides language building blocks.
         qmlRegisterUncreatableType<QQmlLocale>("QtQml", 2, 2, "Locale", QQmlEngine::tr("Locale cannot be instantiated.  Use Qt.locale()"));
 
+        // Auto-increment the import to stay in sync with ALL future QtQml minor versions from 5.11 onward
+        qmlRegisterModule("QtQml", 2, QT_VERSION_MINOR);
+
         QQmlData::init();
         baseModulesUninitialized = false;
     }