Add missing revisions for new 6.7 APIs

Task-number: QTBUG-119952
Change-Id: Id04ba05d551ffd487fd61c5a6222b33883b684e1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 0fdca3e40d9afed9bc745a902a7fce6329d0e2b4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 17 insertions, 14 deletions

diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 96f7e52e15..529e710afa 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -301,7 +301,7 @@ protected:
 private Q_SLOTS:
     void q_updateLayout();
     void triggerPreprocess();
-    QVariant loadResource(int type, const QUrl &source);
+    Q_REVISION(6, 7) QVariant loadResource(int type, const QUrl &source);
     void resourceRequestFinished();
     void imageDownloadFinished();
 
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index f11379803e..b27189800c 100644
--- a/src/quick/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -362,7 +362,7 @@ private Q_SLOTS:
     void q_updateAlignment();
     void updateSize();
     void triggerPreprocess();
-    QVariant loadResource(int type, const QUrl &source);
+    Q_REVISION(6, 7) QVariant loadResource(int type, const QUrl &source);
     void resourceRequestFinished();
 
 private:
diff --git a/src/quick/items/qquickwindowcontainer_p.h b/src/quick/items/qquickwindowcontainer_p.h
index 3f6d236923..fd0d0500ab 100644
--- a/src/quick/items/qquickwindowcontainer_p.h
+++ b/src/quick/items/qquickwindowcontainer_p.h
@@ -31,6 +31,9 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowContainer : public QQuickImplicitSizeIt
     QML_NAMED_ELEMENT(WindowContainer)
     Q_PROPERTY(QWindow *window READ containedWindow WRITE setContainedWindow
                NOTIFY containedWindowChanged DESIGNABLE false FINAL)
+
+    QML_ADDED_IN_VERSION(6, 7)
+
 public:
     enum ContainerMode {
         WindowControlsItem,
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index 01ce3aa70c..4bb482bc83 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -41,10 +41,10 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public Q
     Q_PROPERTY(QWindow::Visibility visibility READ visibility WRITE setVisibility NOTIFY
                        visibilityChanged)
     Q_PROPERTY(QObject *screen READ screen WRITE setScreen NOTIFY screenChanged REVISION(2, 3))
-    Q_PROPERTY(QObject *parent READ visualParent WRITE setVisualParent NOTIFY visualParentChanged DESIGNABLE false FINAL)
-    Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged)
-    Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged)
-    Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY zChanged FINAL)
+    Q_PROPERTY(QObject *parent READ visualParent WRITE setVisualParent NOTIFY visualParentChanged DESIGNABLE false FINAL REVISION(6, 7))
+    Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged REVISION(6, 7))
+    Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged REVISION(6, 7))
+    Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY zChanged FINAL REVISION(6, 7))
     QML_ATTACHED(QQuickWindowAttached)
     QML_NAMED_ELEMENT(Window)
     QML_ADDED_IN_VERSION(2, 1)
@@ -74,12 +74,12 @@ public:
 Q_SIGNALS:
     void visibleChanged(bool arg);
     void visibilityChanged(QWindow::Visibility visibility);
-    void visualParentChanged(QObject *);
+    Q_REVISION(6, 7) void visualParentChanged(QObject *);
     Q_REVISION(2, 3) void screenChanged();
 
-    void xChanged(int arg);
-    void yChanged(int arg);
-    void zChanged();
+    Q_REVISION(6, 7) void xChanged(int arg);
+    Q_REVISION(6, 7) void yChanged(int arg);
+    Q_REVISION(6, 7) void zChanged();
 
 protected:
     void classBegin() override;
@@ -90,8 +90,8 @@ protected:
     QQuickWindowQmlImpl(QQuickWindowQmlImplPrivate &dd, QWindow *parent);
 
 private Q_SLOTS:
-    void applyWindowVisibility();
-    void updateTransientParent();
+    Q_REVISION(6, 7) void applyWindowVisibility();
+    Q_REVISION(6, 7) void updateTransientParent();
 
 private:
     bool transientParentVisible();
diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h
index d130f08641..ee9db637de 100644
--- a/src/quick/util/qquickvaluetypes_p.h
+++ b/src/quick/util/qquickvaluetypes_p.h
@@ -408,7 +408,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFontValueType
     Q_PROPERTY(bool kerning READ kerning WRITE setKerning FINAL)
     Q_PROPERTY(bool preferShaping READ preferShaping WRITE setPreferShaping FINAL)
     Q_PROPERTY(QVariantMap features READ features WRITE setFeatures FINAL)
-    Q_PROPERTY(QVariantMap variableAxes READ variableAxes WRITE setVariableAxes FINAL)
+    Q_PROPERTY(QVariantMap variableAxes READ variableAxes WRITE setVariableAxes FINAL REVISION(6, 7))
 
     QML_VALUE_TYPE(font)
     QML_FOREIGN(QFont)
diff --git a/src/quickshapes/qquickshape_p.h b/src/quickshapes/qquickshape_p.h
index 36a5de0ee7..e5d7ee95d7 100644
--- a/src/quickshapes/qquickshape_p.h
+++ b/src/quickshapes/qquickshape_p.h
@@ -292,7 +292,7 @@ Q_SIGNALS:
     void dashOffsetChanged();
     void dashPatternChanged();
 
-    void pathHintsChanged();
+    Q_REVISION(6, 7) void pathHintsChanged();
 
 private:
     Q_DISABLE_COPY(QQuickShapePath)