Harmonize meta object revisions and minor versions

In order to avoid complexity we want those to match. We can easily
"rename" the meta object revisions as those are not public interfaces.

Change-Id: I48e063d49758c7bacd9b7816bf5541cf67e07b0d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 13 insertions, 13 deletions

diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 6ce079a0dc..70a8b08822 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -246,7 +246,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickTextEdit,1>(uri,2,1,"TextEdit");
     qmlRegisterType<QQuickTextInput>(uri,major,minor,"TextInput");
     qmlRegisterType<QQuickTextInput,2>(uri,2,2,"TextInput");
-    qmlRegisterType<QQuickTextInput,3>(uri,2,4,"TextInput");
+    qmlRegisterType<QQuickTextInput,4>(uri,2,4,"TextInput");
     qmlRegisterAnonymousType<QQuickItemGrabResult>(uri, major);
 #if QT_CONFIG(quick_shadereffect)
     qmlRegisterAnonymousType<QQuickItemLayer>(uri, major);
@@ -334,7 +334,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     const char *itemViewName = "ItemView";
     const QString itemViewMessage = QQuickItemView::tr("ItemView is an abstract base class");
     qmlRegisterUncreatableType<QQuickItemView, 1>(uri, 2, 1, itemViewName, itemViewMessage);
-    qmlRegisterUncreatableType<QQuickItemView, 2>(uri, 2, 3, itemViewName, itemViewMessage);
+    qmlRegisterUncreatableType<QQuickItemView, 3>(uri, 2, 3, itemViewName, itemViewMessage);
 #endif
 #if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 1>(uri, 2, 1, "ListView");
@@ -349,23 +349,23 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
 
     qmlRegisterType<QQuickText, 3>(uri, 2, 3, "Text");
     qmlRegisterType<QQuickTextEdit, 3>(uri, 2, 3, "TextEdit");
-    qmlRegisterType<QQuickImage, 1>(uri, 2, 3,"Image");
+    qmlRegisterType<QQuickImage, 3>(uri, 2, 3,"Image");
 
-    qmlRegisterType<QQuickItem, 2>(uri, 2, 4, "Item");
+    qmlRegisterType<QQuickItem, 4>(uri, 2, 4, "Item");
 #if QT_CONFIG(quick_listview)
-    qmlRegisterType<QQuickListView, 2>(uri, 2, 4, "ListView");
+    qmlRegisterType<QQuickListView, 4>(uri, 2, 4, "ListView");
 #endif
-    qmlRegisterType<QQuickMouseArea, 1>(uri, 2, 4, "MouseArea");
+    qmlRegisterType<QQuickMouseArea, 4>(uri, 2, 4, "MouseArea");
 #if QT_CONFIG(quick_shadereffect)
-    qmlRegisterType<QQuickShaderEffect, 1>(uri, 2, 4, "ShaderEffect");
+    qmlRegisterType<QQuickShaderEffect, 4>(uri, 2, 4, "ShaderEffect");
 #endif
 
 #if QT_CONFIG(opengl)
     qmlRegisterUncreatableType<QQuickOpenGLInfo>(uri, 2, 4,"OpenGLInfo", QQuickOpenGLInfo::tr("OpenGLInfo is only available via attached properties"));
 #endif
-    qmlRegisterType<QQuickPinchArea, 1>(uri, 2, 5,"PinchArea");
-    qmlRegisterType<QQuickImage, 2>(uri, 2, 5,"Image");
-    qmlRegisterType<QQuickMouseArea, 2>(uri, 2, 5, "MouseArea");
+    qmlRegisterType<QQuickPinchArea, 5>(uri, 2, 5,"PinchArea");
+    qmlRegisterType<QQuickImage, 5>(uri, 2, 5,"Image");
+    qmlRegisterType<QQuickMouseArea, 5>(uri, 2, 5, "MouseArea");
 
     qmlRegisterType<QQuickText, 6>(uri, 2, 6, "Text");
     qmlRegisterType<QQuickTextEdit, 6>(uri, 2, 6, "TextEdit");
@@ -381,7 +381,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterUncreatableType<QQuickEnterKeyAttached, 6>(uri, 2, 6, "EnterKey",
                                                            QQuickEnterKeyAttached::tr("EnterKey is only available via attached properties"));
 #if QT_CONFIG(quick_shadereffect)
-    qmlRegisterType<QQuickShaderEffectSource, 1>(uri, 2, 6, "ShaderEffectSource");
+    qmlRegisterType<QQuickShaderEffectSource, 6>(uri, 2, 6, "ShaderEffectSource");
 #endif
 
     qmlRegisterType<QQuickItem, 7>(uri, 2, 7, "Item");
@@ -411,7 +411,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickMouseArea, 9>(uri, 2, 9, "MouseArea");
 
 #if QT_CONFIG(quick_path)
-    qmlRegisterType<QQuickPathArc, 2>(uri, 2, 9, "PathArc");
+    qmlRegisterType<QQuickPathArc, 9>(uri, 2, 9, "PathArc");
     qmlRegisterType<QQuickPathMove>(uri, 2, 9, "PathMove");
 #endif
 
@@ -426,7 +426,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
 #endif
 
 #if QT_CONFIG(quick_shadereffect)
-    qmlRegisterType<QQuickShaderEffectSource, 2>(uri, 2, 9, "ShaderEffectSource");
+    qmlRegisterType<QQuickShaderEffectSource, 9>(uri, 2, 9, "ShaderEffectSource");
 #endif
 
     qmlRegisterType<QQuickFlickable, 10>(uri, 2, 10, "Flickable");