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>

22 files changed, 111 insertions, 111 deletions

diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes
index 8a9bf3f1f1..63f5bada9b 100644
--- a/src/imports/qtqml/plugins.qmltypes
+++ b/src/imports/qtqml/plugins.qmltypes
@@ -108,11 +108,11 @@ Module {
         name: "QQmlConnections"
         prototype: "QObject"
         exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 3]
         Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "enabled"; revision: 1; type: "bool" }
+        Property { name: "enabled"; revision: 3; type: "bool" }
         Property { name: "ignoreUnknownSignals"; type: "bool" }
-        Signal { name: "enabledChanged"; revision: 1 }
+        Signal { name: "enabledChanged"; revision: 3 }
     }
     Component {
         name: "QQmlInstanceModel"
@@ -213,7 +213,7 @@ Module {
         name: "QQmlLoggingCategory"
         prototype: "QObject"
         exports: ["QtQml/LoggingCategory 2.12", "QtQml/LoggingCategory 2.8"]
-        exportMetaObjectRevisions: [1, 0]
+        exportMetaObjectRevisions: [12, 0]
         Enum {
             name: "DefaultLogLevel"
             values: {
@@ -225,7 +225,7 @@ Module {
             }
         }
         Property { name: "name"; type: "string" }
-        Property { name: "defaultLogLevel"; revision: 1; type: "DefaultLogLevel" }
+        Property { name: "defaultLogLevel"; revision: 12; type: "DefaultLogLevel" }
     }
     Component {
         name: "QQmlTimer"
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 8f01e5bb37..c8aae2087d 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -2197,7 +2197,7 @@ Module {
             "QtQuick/Image 2.3",
             "QtQuick/Image 2.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 2]
+        exportMetaObjectRevisions: [0, 3, 5]
         Enum {
             name: "HAlignment"
             values: {
@@ -2231,8 +2231,8 @@ Module {
         Property { name: "paintedHeight"; type: "double"; isReadonly: true }
         Property { name: "horizontalAlignment"; type: "HAlignment" }
         Property { name: "verticalAlignment"; type: "VAlignment" }
-        Property { name: "mipmap"; revision: 1; type: "bool" }
-        Property { name: "autoTransform"; revision: 2; type: "bool" }
+        Property { name: "mipmap"; revision: 3; type: "bool" }
+        Property { name: "autoTransform"; revision: 5; type: "bool" }
         Signal { name: "paintedGeometryChanged" }
         Signal {
             name: "horizontalAlignmentChanged"
@@ -2244,10 +2244,10 @@ Module {
         }
         Signal {
             name: "mipmapChanged"
-            revision: 1
+            revision: 3
             Parameter { type: "bool" }
         }
-        Signal { name: "autoTransformChanged"; revision: 2 }
+        Signal { name: "autoTransformChanged"; revision: 5 }
     }
     Component {
         name: "QQuickImageBase"
@@ -2308,7 +2308,7 @@ Module {
             "QtQuick/Item 2.4",
             "QtQuick/Item 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 11, 2, 7]
+        exportMetaObjectRevisions: [0, 1, 11, 4, 7]
         Enum {
             name: "Flags"
             values: {
@@ -2428,14 +2428,14 @@ Module {
         Method { name: "update" }
         Method {
             name: "grabToImage"
-            revision: 2
+            revision: 4
             type: "bool"
             Parameter { name: "callback"; type: "QJSValue" }
             Parameter { name: "targetSize"; type: "QSize" }
         }
         Method {
             name: "grabToImage"
-            revision: 2
+            revision: 4
             type: "bool"
             Parameter { name: "callback"; type: "QJSValue" }
         }
@@ -2568,7 +2568,7 @@ Module {
             "QtQuick/ItemView 2.7"
         ]
         isCreatable: false
-        exportMetaObjectRevisions: [1, 13, 2, 7]
+        exportMetaObjectRevisions: [1, 13, 3, 7]
         Enum {
             name: "LayoutDirection"
             values: {
@@ -2612,8 +2612,8 @@ Module {
         Property { name: "keyNavigationWraps"; type: "bool" }
         Property { name: "keyNavigationEnabled"; revision: 7; type: "bool" }
         Property { name: "cacheBuffer"; type: "int" }
-        Property { name: "displayMarginBeginning"; revision: 2; type: "int" }
-        Property { name: "displayMarginEnd"; revision: 2; type: "int" }
+        Property { name: "displayMarginBeginning"; revision: 3; type: "int" }
+        Property { name: "displayMarginEnd"; revision: 3; type: "int" }
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
         Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
         Property { name: "verticalLayoutDirection"; type: "VerticalLayoutDirection" }
@@ -2924,7 +2924,7 @@ Module {
             "QtQuick/ListView 2.4",
             "QtQuick/ListView 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 7]
+        exportMetaObjectRevisions: [0, 1, 4, 7]
         attachedType: "QQuickListViewAttached"
         Enum {
             name: "Orientation"
@@ -2965,10 +2965,10 @@ Module {
         Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true }
         Property { name: "currentSection"; type: "string"; isReadonly: true }
         Property { name: "snapMode"; type: "SnapMode" }
-        Property { name: "headerPositioning"; revision: 2; type: "HeaderPositioning" }
-        Property { name: "footerPositioning"; revision: 2; type: "FooterPositioning" }
-        Signal { name: "headerPositioningChanged"; revision: 2 }
-        Signal { name: "footerPositioningChanged"; revision: 2 }
+        Property { name: "headerPositioning"; revision: 4; type: "HeaderPositioning" }
+        Property { name: "footerPositioning"; revision: 4; type: "FooterPositioning" }
+        Signal { name: "headerPositioningChanged"; revision: 4 }
+        Signal { name: "footerPositioningChanged"; revision: 4 }
         Method { name: "incrementCurrentIndex" }
         Method { name: "decrementCurrentIndex" }
     }
@@ -3018,13 +3018,13 @@ Module {
             "QtQuick/MouseArea 2.5",
             "QtQuick/MouseArea 2.9"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 9]
+        exportMetaObjectRevisions: [0, 4, 5, 9]
         Property { name: "mouseX"; type: "double"; isReadonly: true }
         Property { name: "mouseY"; type: "double"; isReadonly: true }
         Property { name: "containsMouse"; type: "bool"; isReadonly: true }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
         Property { name: "enabled"; type: "bool" }
-        Property { name: "scrollGestureEnabled"; revision: 2; type: "bool" }
+        Property { name: "scrollGestureEnabled"; revision: 5; type: "bool" }
         Property { name: "pressedButtons"; type: "Qt::MouseButtons"; isReadonly: true }
         Property { name: "acceptedButtons"; type: "Qt::MouseButtons" }
         Property { name: "hoverEnabled"; type: "bool" }
@@ -3032,10 +3032,10 @@ Module {
         Property { name: "preventStealing"; type: "bool" }
         Property { name: "propagateComposedEvents"; type: "bool" }
         Property { name: "cursorShape"; type: "Qt::CursorShape" }
-        Property { name: "containsPress"; revision: 1; type: "bool"; isReadonly: true }
+        Property { name: "containsPress"; revision: 4; type: "bool"; isReadonly: true }
         Property { name: "pressAndHoldInterval"; revision: 9; type: "int" }
         Signal { name: "hoveredChanged" }
-        Signal { name: "scrollGestureEnabledChanged"; revision: 2 }
+        Signal { name: "scrollGestureEnabledChanged"; revision: 5 }
         Signal {
             name: "positionChanged"
             Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
@@ -3075,7 +3075,7 @@ Module {
         Signal { name: "entered" }
         Signal { name: "exited" }
         Signal { name: "canceled" }
-        Signal { name: "containsPressChanged"; revision: 1 }
+        Signal { name: "containsPressChanged"; revision: 4 }
         Signal { name: "pressAndHoldIntervalChanged"; revision: 9 }
     }
     Component {
@@ -3324,7 +3324,7 @@ Module {
         name: "QQuickPathArc"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathArc 2.0", "QtQuick/PathArc 2.9"]
-        exportMetaObjectRevisions: [0, 2]
+        exportMetaObjectRevisions: [0, 9]
         Enum {
             name: "ArcDirection"
             values: {
@@ -3336,8 +3336,8 @@ Module {
         Property { name: "radiusY"; type: "double" }
         Property { name: "useLargeArc"; type: "bool" }
         Property { name: "direction"; type: "ArcDirection" }
-        Property { name: "xAxisRotation"; revision: 2; type: "double" }
-        Signal { name: "xAxisRotationChanged"; revision: 2 }
+        Property { name: "xAxisRotation"; revision: 9; type: "double" }
+        Signal { name: "xAxisRotationChanged"; revision: 9 }
     }
     Component {
         name: "QQuickPathAttribute"
@@ -3598,7 +3598,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/PinchArea 2.0", "QtQuick/PinchArea 2.5"]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 5]
         Property { name: "enabled"; type: "bool" }
         Property { name: "pinch"; type: "QQuickPinch"; isReadonly: true; isPointer: true }
         Signal {
@@ -3615,7 +3615,7 @@ Module {
         }
         Signal {
             name: "smartZoom"
-            revision: 1
+            revision: 5
             Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true }
         }
     }
@@ -4010,7 +4010,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/ShaderEffect 2.0", "QtQuick/ShaderEffect 2.4"]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 4]
         Enum {
             name: "CullMode"
             values: {
@@ -4034,7 +4034,7 @@ Module {
         Property { name: "cullMode"; type: "CullMode" }
         Property { name: "log"; type: "string"; isReadonly: true }
         Property { name: "status"; type: "Status"; isReadonly: true }
-        Property { name: "supportsAtlasTextures"; revision: 1; type: "bool" }
+        Property { name: "supportsAtlasTextures"; revision: 4; type: "bool" }
     }
     Component {
         name: "QQuickShaderEffectMesh"
@@ -4053,7 +4053,7 @@ Module {
             "QtQuick/ShaderEffectSource 2.6",
             "QtQuick/ShaderEffectSource 2.9"
         ]
-        exportMetaObjectRevisions: [0, 1, 2]
+        exportMetaObjectRevisions: [0, 6, 9]
         Enum {
             name: "WrapMode"
             values: {
@@ -4088,8 +4088,8 @@ Module {
         Property { name: "hideSource"; type: "bool" }
         Property { name: "mipmap"; type: "bool" }
         Property { name: "recursive"; type: "bool" }
-        Property { name: "textureMirroring"; revision: 1; type: "TextureMirroring" }
-        Property { name: "samples"; revision: 2; type: "int" }
+        Property { name: "textureMirroring"; revision: 6; type: "TextureMirroring" }
+        Property { name: "samples"; revision: 9; type: "int" }
         Signal { name: "scheduledUpdateCompleted" }
         Method { name: "scheduleUpdate" }
     }
@@ -4101,11 +4101,11 @@ Module {
             "QtQuick/Shortcut 2.6",
             "QtQuick/Shortcut 2.9"
         ]
-        exportMetaObjectRevisions: [0, 1, 9]
+        exportMetaObjectRevisions: [0, 6, 9]
         Property { name: "sequence"; type: "QVariant" }
         Property { name: "sequences"; revision: 9; type: "QVariantList" }
-        Property { name: "nativeText"; revision: 1; type: "string"; isReadonly: true }
-        Property { name: "portableText"; revision: 1; type: "string"; isReadonly: true }
+        Property { name: "nativeText"; revision: 6; type: "string"; isReadonly: true }
+        Property { name: "portableText"; revision: 6; type: "string"; isReadonly: true }
         Property { name: "enabled"; type: "bool" }
         Property { name: "autoRepeat"; type: "bool" }
         Property { name: "context"; type: "Qt::ShortcutContext" }
@@ -4988,7 +4988,7 @@ Module {
             "QtQuick/TextInput 2.7",
             "QtQuick/TextInput 2.9"
         ]
-        exportMetaObjectRevisions: [0, 2, 3, 6, 7, 9]
+        exportMetaObjectRevisions: [0, 2, 4, 6, 7, 9]
         Enum {
             name: "EchoMode"
             values: {
@@ -5072,7 +5072,7 @@ Module {
         Property { name: "echoMode"; type: "EchoMode" }
         Property { name: "activeFocusOnPress"; type: "bool" }
         Property { name: "passwordCharacter"; type: "string" }
-        Property { name: "passwordMaskDelay"; revision: 3; type: "int" }
+        Property { name: "passwordMaskDelay"; revision: 4; type: "int" }
         Property { name: "displayText"; type: "string"; isReadonly: true }
         Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
         Property { name: "autoScroll"; type: "bool" }
@@ -5132,7 +5132,7 @@ Module {
         }
         Signal {
             name: "passwordMaskDelayChanged"
-            revision: 3
+            revision: 4
             Parameter { name: "delay"; type: "int" }
         }
         Signal { name: "preeditTextChanged"; revision: 7 }
@@ -5189,7 +5189,7 @@ Module {
         }
         Method {
             name: "ensureVisible"
-            revision: 3
+            revision: 4
             Parameter { name: "position"; type: "int" }
         }
         Method { name: "clear"; revision: 7 }
@@ -5213,7 +5213,7 @@ Module {
         }
         Method {
             name: "inputMethodQuery"
-            revision: 3
+            revision: 4
             type: "QVariant"
             Parameter { name: "query"; type: "Qt::InputMethodQuery" }
             Parameter { name: "argument"; type: "QVariant" }
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index 596da2d234..82b7ce0fc5 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -26,7 +26,7 @@ Module {
         prototype: "QObject"
         exports: ["QtQuick.Window/Screen 2.0", "QtQuick.Window/Screen 2.3"]
         isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 3]
         attachedType: "QQuickScreenAttached"
     }
     Component {
@@ -48,7 +48,7 @@ Module {
             "QtQuick.Window/ScreenInfo 2.3"
         ]
         isCreatable: false
-        exportMetaObjectRevisions: [10, 2]
+        exportMetaObjectRevisions: [10, 3]
         Property { name: "name"; type: "string"; isReadonly: true }
         Property { name: "manufacturer"; revision: 10; type: "string"; isReadonly: true }
         Property { name: "model"; revision: 10; type: "string"; isReadonly: true }
@@ -62,14 +62,14 @@ Module {
         Property { name: "devicePixelRatio"; type: "double"; isReadonly: true }
         Property { name: "primaryOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
         Property { name: "orientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
-        Property { name: "virtualX"; revision: 1; type: "int"; isReadonly: true }
-        Property { name: "virtualY"; revision: 1; type: "int"; isReadonly: true }
+        Property { name: "virtualX"; revision: 3; type: "int"; isReadonly: true }
+        Property { name: "virtualY"; revision: 3; type: "int"; isReadonly: true }
         Signal { name: "manufacturerChanged"; revision: 10 }
         Signal { name: "modelChanged"; revision: 10 }
         Signal { name: "serialNumberChanged"; revision: 10 }
         Signal { name: "desktopGeometryChanged" }
-        Signal { name: "virtualXChanged"; revision: 1 }
-        Signal { name: "virtualYChanged"; revision: 1 }
+        Signal { name: "virtualXChanged"; revision: 3 }
+        Signal { name: "virtualYChanged"; revision: 3 }
     }
     Component {
         name: "QQuickWindow"
@@ -166,11 +166,11 @@ Module {
             "QtQuick.Window/Window 2.2",
             "QtQuick.Window/Window 2.3"
         ]
-        exportMetaObjectRevisions: [0, 13, 1, 2]
+        exportMetaObjectRevisions: [0, 13, 2, 3]
         attachedType: "QQuickWindowAttached"
         Property { name: "visible"; type: "bool" }
         Property { name: "visibility"; type: "Visibility" }
-        Property { name: "screen"; revision: 2; type: "QObject"; isPointer: true }
+        Property { name: "screen"; revision: 3; type: "QObject"; isPointer: true }
         Signal {
             name: "visibleChanged"
             Parameter { name: "arg"; type: "bool" }
@@ -179,7 +179,7 @@ Module {
             name: "visibilityChanged"
             Parameter { name: "visibility"; type: "QWindow::Visibility" }
         }
-        Signal { name: "screenChanged"; revision: 2 }
+        Signal { name: "screenChanged"; revision: 3 }
     }
     Component {
         name: "QWindow"
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 9c3c9de81e..0fd07ea209 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -210,14 +210,14 @@ void QQmlEnginePrivate::defineModule()
     // TODO: We won't need Connections to be a custom type anymore once we can drop the
     //       automatic signal handler inference from undeclared properties.
     qmlRegisterCustomType<QQmlConnections>(uri, 2, 0, "Connections", new QQmlConnectionsParser);
-    qmlRegisterCustomType<QQmlConnections, 1>(uri, 2, 3, "Connections", new QQmlConnectionsParser); // Only available in QtQml >= 2.3
+    qmlRegisterCustomType<QQmlConnections, 3>(uri, 2, 3, "Connections", new QQmlConnectionsParser); // Only available in QtQml >= 2.3
 
 #if QT_CONFIG(qml_animation)
     qmlRegisterType<QQmlTimer>(uri, 2, 0, "Timer");
 #endif
 
     qmlRegisterType<QQmlLoggingCategory>(uri, 2, 8, "LoggingCategory"); // Only available in >= 2.8
-    qmlRegisterType<QQmlLoggingCategory, 1>(uri, 2, 12, "LoggingCategory"); // Only available in >= 2.12
+    qmlRegisterType<QQmlLoggingCategory, 12>(uri, 2, 12, "LoggingCategory"); // Only available in >= 2.12
 
 #if QT_CONFIG(qml_locale)
     qmlRegisterUncreatableType<QQmlLocale>(uri, 2, 2, "Locale", QQmlEngine::tr("Locale cannot be instantiated. Use Qt.locale()"));
@@ -236,12 +236,12 @@ void QQmlEnginePrivate::registerQuickTypes()
     qmlRegisterType<QQmlBind>(uri, 2, 0, "Binding");
     qmlRegisterType<QQmlBind, 8>(uri, 2, 8, "Binding");
     qmlRegisterCustomType<QQmlConnections>(uri, 2, 0, "Connections", new QQmlConnectionsParser);
-    qmlRegisterCustomType<QQmlConnections, 1>(uri, 2, 7, "Connections", new QQmlConnectionsParser);
+    qmlRegisterCustomType<QQmlConnections, 3>(uri, 2, 7, "Connections", new QQmlConnectionsParser);
 #if QT_CONFIG(qml_animation)
     qmlRegisterType<QQmlTimer>(uri, 2, 0,"Timer");
 #endif
     qmlRegisterType<QQmlLoggingCategory>(uri, 2, 8, "LoggingCategory");
-    qmlRegisterType<QQmlLoggingCategory, 1>(uri, 2, 12, "LoggingCategory");
+    qmlRegisterType<QQmlLoggingCategory, 12>(uri, 2, 12, "LoggingCategory");
 #if QT_CONFIG(qml_locale)
     qmlRegisterUncreatableType<QQmlLocale>(uri, 2, 0, "Locale", QQmlEngine::tr("Locale cannot be instantiated. Use Qt.locale()"));
 #endif
diff --git a/src/qml/qml/qqmlloggingcategory_p.h b/src/qml/qml/qqmlloggingcategory_p.h
index ece06e04b4..ee5d9af2e7 100644
--- a/src/qml/qml/qqmlloggingcategory_p.h
+++ b/src/qml/qml/qqmlloggingcategory_p.h
@@ -65,7 +65,7 @@ class QQmlLoggingCategory : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(DefaultLogLevel defaultLogLevel READ defaultLogLevel WRITE setDefaultLogLevel REVISION 1)
+    Q_PROPERTY(DefaultLogLevel defaultLogLevel READ defaultLogLevel WRITE setDefaultLogLevel REVISION 12)
 
 public:
     enum DefaultLogLevel {
diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h
index 1acc86239f..5d28e8e8be 100644
--- a/src/qml/types/qqmlconnections_p.h
+++ b/src/qml/types/qqmlconnections_p.h
@@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QQmlConnections : public QObject, public QQmlParserStatu
 
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged REVISION 1)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged REVISION 3)
     Q_PROPERTY(bool ignoreUnknownSignals READ ignoreUnknownSignals WRITE setIgnoreUnknownSignals)
 
 public:
@@ -87,7 +87,7 @@ public:
 
 Q_SIGNALS:
     void targetChanged();
-    Q_REVISION(1) void enabledChanged();
+    Q_REVISION(3) void enabledChanged();
 
 private:
     void connectSignals();
diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 7fb4413900..257cde5313 100644
--- a/src/quick/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -66,8 +66,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImage : public QQuickImageBase
     Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedGeometryChanged)
     Q_PROPERTY(HAlignment horizontalAlignment READ horizontalAlignment WRITE setHorizontalAlignment NOTIFY horizontalAlignmentChanged)
     Q_PROPERTY(VAlignment verticalAlignment READ verticalAlignment WRITE setVerticalAlignment NOTIFY verticalAlignmentChanged)
-    Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged REVISION 1)
-    Q_PROPERTY(bool autoTransform READ autoTransform WRITE setAutoTransform NOTIFY autoTransformChanged REVISION 2)
+    Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged REVISION 3)
+    Q_PROPERTY(bool autoTransform READ autoTransform WRITE setAutoTransform NOTIFY autoTransformChanged REVISION 5)
 
 public:
     QQuickImage(QQuickItem *parent=nullptr);
@@ -112,8 +112,8 @@ Q_SIGNALS:
     void paintedGeometryChanged();
     void horizontalAlignmentChanged(HAlignment alignment);
     void verticalAlignmentChanged(VAlignment alignment);
-    Q_REVISION(1) void mipmapChanged(bool);
-    Q_REVISION(2) void autoTransformChanged();
+    Q_REVISION(3) void mipmapChanged(bool);
+    Q_REVISION(5) void autoTransformChanged();
 
 private Q_SLOTS:
     void invalidateSceneGraph();
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index ad9bab2a90..394a5adb8c 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -318,7 +318,7 @@ public:
     void setKeepTouchGrab(bool);
 
     // implemented in qquickitemgrabresult.cpp
-    Q_REVISION(2) Q_INVOKABLE bool grabToImage(const QJSValue &callback, const QSize &targetSize = QSize());
+    Q_REVISION(4) Q_INVOKABLE bool grabToImage(const QJSValue &callback, const QSize &targetSize = QSize());
     QSharedPointer<QQuickItemGrabResult> grabToImage(const QSize &targetSize = QSize());
 
     Q_INVOKABLE virtual bool contains(const QPointF &point) const;
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");
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 0a0da587b4..66e09f9ed1 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -81,8 +81,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickItemView : public QQuickFlickable
     Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled NOTIFY keyNavigationWrapsChanged)
     Q_PROPERTY(bool keyNavigationEnabled READ isKeyNavigationEnabled WRITE setKeyNavigationEnabled NOTIFY keyNavigationEnabledChanged REVISION 7)
     Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
-    Q_PROPERTY(int displayMarginBeginning READ displayMarginBeginning WRITE setDisplayMarginBeginning NOTIFY displayMarginBeginningChanged REVISION 2)
-    Q_PROPERTY(int displayMarginEnd READ displayMarginEnd WRITE setDisplayMarginEnd NOTIFY displayMarginEndChanged REVISION 2)
+    Q_PROPERTY(int displayMarginBeginning READ displayMarginBeginning WRITE setDisplayMarginBeginning NOTIFY displayMarginBeginningChanged REVISION 3)
+    Q_PROPERTY(int displayMarginEnd READ displayMarginEnd WRITE setDisplayMarginEnd NOTIFY displayMarginEndChanged REVISION 3)
 
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index 9a9b325b1e..f2bab9e018 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -126,8 +126,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickListView : public QQuickItemView
 
     Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged)
 
-    Q_PROPERTY(HeaderPositioning headerPositioning READ headerPositioning WRITE setHeaderPositioning NOTIFY headerPositioningChanged REVISION 2)
-    Q_PROPERTY(FooterPositioning footerPositioning READ footerPositioning WRITE setFooterPositioning NOTIFY footerPositioningChanged REVISION 2)
+    Q_PROPERTY(HeaderPositioning headerPositioning READ headerPositioning WRITE setHeaderPositioning NOTIFY headerPositioningChanged REVISION 4)
+    Q_PROPERTY(FooterPositioning footerPositioning READ footerPositioning WRITE setFooterPositioning NOTIFY footerPositioningChanged REVISION 4)
 
     Q_CLASSINFO("DefaultProperty", "data")
 
@@ -188,8 +188,8 @@ Q_SIGNALS:
     void highlightResizeVelocityChanged();
     void highlightResizeDurationChanged();
     void snapModeChanged();
-    Q_REVISION(2) void headerPositioningChanged();
-    Q_REVISION(2) void footerPositioningChanged();
+    Q_REVISION(4) void headerPositioningChanged();
+    Q_REVISION(4) void footerPositioningChanged();
 
 protected:
     void viewportMoved(Qt::Orientations orient) override;
diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h
index 76e5c98b35..0e01fa7915 100644
--- a/src/quick/items/qquickmousearea_p.h
+++ b/src/quick/items/qquickmousearea_p.h
@@ -71,7 +71,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickMouseArea : public QQuickItem
     Q_PROPERTY(bool containsMouse READ hovered NOTIFY hoveredChanged)
     Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(bool scrollGestureEnabled READ isScrollGestureEnabled WRITE setScrollGestureEnabled NOTIFY scrollGestureEnabledChanged REVISION 2)
+    Q_PROPERTY(bool scrollGestureEnabled READ isScrollGestureEnabled WRITE setScrollGestureEnabled NOTIFY scrollGestureEnabledChanged REVISION 5)
     Q_PROPERTY(Qt::MouseButtons pressedButtons READ pressedButtons NOTIFY pressedButtonsChanged)
     Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
     Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged)
@@ -83,7 +83,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickMouseArea : public QQuickItem
 #if QT_CONFIG(cursor)
     Q_PROPERTY(Qt::CursorShape cursorShape READ cursorShape WRITE setCursorShape RESET unsetCursor NOTIFY cursorShapeChanged)
 #endif
-    Q_PROPERTY(bool containsPress READ containsPress NOTIFY containsPressChanged REVISION 1)
+    Q_PROPERTY(bool containsPress READ containsPress NOTIFY containsPressChanged REVISION 4)
     Q_PROPERTY(int pressAndHoldInterval READ pressAndHoldInterval WRITE setPressAndHoldInterval NOTIFY pressAndHoldIntervalChanged RESET resetPressAndHoldInterval REVISION 9)
 
 public:
@@ -134,7 +134,7 @@ Q_SIGNALS:
     void hoveredChanged();
     void pressedChanged();
     void enabledChanged();
-    Q_REVISION(2) void scrollGestureEnabledChanged();
+    Q_REVISION(5) void scrollGestureEnabledChanged();
     void pressedButtonsChanged();
     void acceptedButtonsChanged();
     void hoverEnabledChanged();
@@ -156,7 +156,7 @@ Q_SIGNALS:
     void entered();
     void exited();
     void canceled();
-    Q_REVISION(1) void containsPressChanged();
+    Q_REVISION(4) void containsPressChanged();
     Q_REVISION(9) void pressAndHoldIntervalChanged();
 
 protected:
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 579a3ce27c..cf21555823 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -283,7 +283,7 @@ Q_SIGNALS:
     void pinchStarted(QQuickPinchEvent *pinch);
     void pinchUpdated(QQuickPinchEvent *pinch);
     void pinchFinished(QQuickPinchEvent *pinch);
-    Q_REVISION(1) void smartZoom(QQuickPinchEvent *pinch);
+    Q_REVISION(5) void smartZoom(QQuickPinchEvent *pinch);
 
 protected:
     bool childMouseEventFilter(QQuickItem *i, QEvent *e) override;
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h
index e9db07d14c..10e524e4a0 100644
--- a/src/quick/items/qquickscreen_p.h
+++ b/src/quick/items/qquickscreen_p.h
@@ -83,8 +83,8 @@ class Q_AUTOTEST_EXPORT QQuickScreenInfo : public QObject
     // TODO Qt 6 Remove this orientation -> incomplete device orientation -> better use OrientationSensor
     Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged)
 
-    Q_PROPERTY(int virtualX READ virtualX NOTIFY virtualXChanged REVISION 1)
-    Q_PROPERTY(int virtualY READ virtualY NOTIFY virtualYChanged REVISION 1)
+    Q_PROPERTY(int virtualX READ virtualX NOTIFY virtualXChanged REVISION 3)
+    Q_PROPERTY(int virtualY READ virtualY NOTIFY virtualYChanged REVISION 3)
 
 public:
     QQuickScreenInfo(QObject *parent = nullptr, QScreen *wrappedScreen = nullptr);
@@ -121,8 +121,8 @@ Q_SIGNALS:
     void devicePixelRatioChanged();
     void primaryOrientationChanged();
     void orientationChanged();
-    Q_REVISION(1) void virtualXChanged();
-    Q_REVISION(1) void virtualYChanged();
+    Q_REVISION(3) void virtualXChanged();
+    Q_REVISION(3) void virtualYChanged();
 
 protected:
     QPointer<QScreen> m_screen;
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index c5bddc40d2..6e2f35882b 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -74,7 +74,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffect : public QQuickItem
     Q_PROPERTY(CullMode cullMode READ cullMode WRITE setCullMode NOTIFY cullModeChanged)
     Q_PROPERTY(QString log READ log NOTIFY logChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(bool supportsAtlasTextures READ supportsAtlasTextures WRITE setSupportsAtlasTextures NOTIFY supportsAtlasTexturesChanged REVISION 1)
+    Q_PROPERTY(bool supportsAtlasTextures READ supportsAtlasTextures WRITE setSupportsAtlasTextures NOTIFY supportsAtlasTexturesChanged REVISION 4)
 
 public:
     enum CullMode {
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index d5bb33902a..d612d1179f 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -87,8 +87,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectSource : public QQuickItem, publi
     Q_PROPERTY(bool hideSource READ hideSource WRITE setHideSource NOTIFY hideSourceChanged)
     Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged)
     Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
-    Q_PROPERTY(TextureMirroring textureMirroring READ textureMirroring WRITE setTextureMirroring NOTIFY textureMirroringChanged REVISION 1)
-    Q_PROPERTY(int samples READ samples WRITE setSamples NOTIFY samplesChanged REVISION 2)
+    Q_PROPERTY(TextureMirroring textureMirroring READ textureMirroring WRITE setTextureMirroring NOTIFY textureMirroringChanged REVISION 6)
+    Q_PROPERTY(int samples READ samples WRITE setSamples NOTIFY samplesChanged REVISION 9)
 
 public:
     enum WrapMode {
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index c46a2f8128..92f3aa62ce 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -93,7 +93,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
     Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
     Q_PROPERTY(bool activeFocusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY activeFocusOnPressChanged)
     Q_PROPERTY(QString passwordCharacter READ passwordCharacter WRITE setPasswordCharacter NOTIFY passwordCharacterChanged)
-    Q_PROPERTY(int passwordMaskDelay READ passwordMaskDelay WRITE setPasswordMaskDelay RESET resetPasswordMaskDelay NOTIFY passwordMaskDelayChanged REVISION 3)
+    Q_PROPERTY(int passwordMaskDelay READ passwordMaskDelay WRITE setPasswordMaskDelay RESET resetPasswordMaskDelay NOTIFY passwordMaskDelayChanged REVISION 4)
     Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged)
     Q_PROPERTY(QString preeditText READ preeditText NOTIFY preeditTextChanged REVISION 7)
     Q_PROPERTY(bool autoScroll READ autoScroll WRITE setAutoScroll NOTIFY autoScrollChanged)
@@ -268,7 +268,7 @@ public:
 
 #if QT_CONFIG(im)
     QVariant inputMethodQuery(Qt::InputMethodQuery property) const override;
-    Q_REVISION(3) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const;
+    Q_REVISION(4) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const;
 #endif
 
     QRectF boundingRect() const override;
@@ -336,7 +336,7 @@ Q_SIGNALS:
     void inputMaskChanged(const QString &inputMask);
     void echoModeChanged(QQuickTextInput::EchoMode echoMode);
     void passwordCharacterChanged();
-    Q_REVISION(3) void passwordMaskDelayChanged(int delay);
+    Q_REVISION(4) void passwordMaskDelayChanged(int delay);
     void displayTextChanged();
     Q_REVISION(7) void preeditTextChanged();
     void activeFocusOnPressChanged(bool activeFocusOnPress);
@@ -399,7 +399,7 @@ public Q_SLOTS:
     void redo();
     void insert(int position, const QString &text);
     void remove(int start, int end);
-    Q_REVISION(3) void ensureVisible(int position);
+    Q_REVISION(4) void ensureVisible(int position);
     Q_REVISION(7) void clear();
 
 private Q_SLOTS:
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index 7b3874dbfe..4b2b8f498d 100644
--- a/src/quick/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -205,11 +205,11 @@ void QQuickWindowModule::defineModule()
     qmlRegisterRevision<QQuickWindow,1>(uri, 2, 1);//Type moved to a subclass, but also has new members
     qmlRegisterRevision<QQuickWindow,2>(uri, 2, 2);
     qmlRegisterType<QQuickWindowQmlImpl>(uri, 2, 1, "Window");
-    qmlRegisterType<QQuickWindowQmlImpl,1>(uri, 2, 2, "Window");
-    qmlRegisterType<QQuickWindowQmlImpl,2>(uri, 2, 3, "Window");
+    qmlRegisterType<QQuickWindowQmlImpl,2>(uri, 2, 2, "Window");
+    qmlRegisterType<QQuickWindowQmlImpl,3>(uri, 2, 3, "Window");
     qmlRegisterUncreatableType<QQuickScreen>(uri, 2, 0, "Screen", QStringLiteral("Screen can only be used via the attached property."));
-    qmlRegisterUncreatableType<QQuickScreen,1>(uri, 2, 3, "Screen", QStringLiteral("Screen can only be used via the attached property."));
-    qmlRegisterUncreatableType<QQuickScreenInfo,2>(uri, 2, 3, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property."));
+    qmlRegisterUncreatableType<QQuickScreen,3>(uri, 2, 3, "Screen", QStringLiteral("Screen can only be used via the attached property."));
+    qmlRegisterUncreatableType<QQuickScreenInfo,3>(uri, 2, 3, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property."));
     qmlRegisterUncreatableType<QQuickScreenInfo,10>(uri, 2, 10, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property."));
     qmlRegisterRevision<QWindow,13>(uri, 2, 13);
     qmlRegisterRevision<QQuickWindow,13>(uri, 2, 13);
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index e7033e9b8d..1dcf1a1021 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -67,7 +67,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public Q
 
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged)
-    Q_PROPERTY(QObject *screen READ screen WRITE setScreen NOTIFY screenChanged REVISION 2)
+    Q_PROPERTY(QObject *screen READ screen WRITE setScreen NOTIFY screenChanged REVISION 3)
 
 public:
     QQuickWindowQmlImpl(QWindow *parent = nullptr);
@@ -83,7 +83,7 @@ public:
 Q_SIGNALS:
     void visibleChanged(bool arg);
     void visibilityChanged(QWindow::Visibility visibility);
-    Q_REVISION(2) void screenChanged();
+    Q_REVISION(3) void screenChanged();
 
 protected:
     void classBegin() override;
diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h
index aa3425ff6c..92607a6c1e 100644
--- a/src/quick/util/qquickpath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -290,7 +290,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathArc : public QQuickCurve
     Q_PROPERTY(qreal radiusY READ radiusY WRITE setRadiusY NOTIFY radiusYChanged)
     Q_PROPERTY(bool useLargeArc READ useLargeArc WRITE setUseLargeArc NOTIFY useLargeArcChanged)
     Q_PROPERTY(ArcDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
-    Q_PROPERTY(qreal xAxisRotation READ xAxisRotation WRITE setXAxisRotation NOTIFY xAxisRotationChanged REVISION 2)
+    Q_PROPERTY(qreal xAxisRotation READ xAxisRotation WRITE setXAxisRotation NOTIFY xAxisRotationChanged REVISION 9)
 
 public:
     QQuickPathArc(QObject *parent=nullptr)
@@ -321,7 +321,7 @@ Q_SIGNALS:
     void radiusYChanged();
     void useLargeArcChanged();
     void directionChanged();
-    Q_REVISION(2) void xAxisRotationChanged();
+    Q_REVISION(9) void xAxisRotationChanged();
 
 private:
     qreal _radiusX = 0;
diff --git a/src/quick/util/qquickshortcut_p.h b/src/quick/util/qquickshortcut_p.h
index c5d5501cb7..712cca7696 100644
--- a/src/quick/util/qquickshortcut_p.h
+++ b/src/quick/util/qquickshortcut_p.h
@@ -67,8 +67,8 @@ class QQuickShortcut : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QVariant sequence READ sequence WRITE setSequence NOTIFY sequenceChanged FINAL)
     Q_PROPERTY(QVariantList sequences READ sequences WRITE setSequences NOTIFY sequencesChanged FINAL REVISION 9)
-    Q_PROPERTY(QString nativeText READ nativeText NOTIFY sequenceChanged FINAL REVISION 1)
-    Q_PROPERTY(QString portableText READ portableText NOTIFY sequenceChanged FINAL REVISION 1)
+    Q_PROPERTY(QString nativeText READ nativeText NOTIFY sequenceChanged FINAL REVISION 6)
+    Q_PROPERTY(QString portableText READ portableText NOTIFY sequenceChanged FINAL REVISION 6)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL)
     Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL)
     Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext NOTIFY contextChanged FINAL)
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp
index 7c8134ba6f..93b6599506 100644
--- a/src/quick/util/qquickutilmodule.cpp
+++ b/src/quick/util/qquickutilmodule.cpp
@@ -131,7 +131,7 @@ void QQuickUtilModule::defineModule()
 
 #if QT_CONFIG(shortcut)
     qmlRegisterType<QQuickShortcut>("QtQuick", 2, 5, "Shortcut");
-    qmlRegisterType<QQuickShortcut,1>("QtQuick", 2, 6, "Shortcut");
+    qmlRegisterType<QQuickShortcut,6>("QtQuick", 2, 6, "Shortcut");
 
     qmlRegisterType<QQuickShortcut,9>("QtQuick", 2, 9, "Shortcut");
 #endif