1 files changed, 26 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index c64ed537f7..281c67800e 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -32,7 +32,7 @@ struct QWindowForeign
     QML_ADDED_IN_VERSION(2, 1)
 };
 
-class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public QQmlParserStatus
+class Q_QUICK_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
@@ -41,12 +41,17 @@ 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 REVISION(6, 7))
+    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 REVISION(6, 7))
     QML_ATTACHED(QQuickWindowAttached)
     QML_NAMED_ELEMENT(Window)
     QML_ADDED_IN_VERSION(2, 1)
 
 public:
     QQuickWindowQmlImpl(QWindow *parent = nullptr);
+    ~QQuickWindowQmlImpl();
 
     void setVisible(bool visible);
     void setVisibility(QWindow::Visibility visibility);
@@ -54,24 +59,43 @@ public:
     QObject *screen() const;
     void setScreen(QObject *screen);
 
+    QObject *visualParent() const;
+    void setVisualParent(QObject *parent);
+
+    void setX(int arg);
+    int x() const;
+    void setY(int arg);
+    int y() const;
+    void setZ(qreal arg);
+    qreal z() const;
+
     static QQuickWindowAttached *qmlAttachedProperties(QObject *object);
 
 Q_SIGNALS:
     void visibleChanged(bool arg);
     void visibilityChanged(QWindow::Visibility visibility);
+    Q_REVISION(6, 7) void visualParentChanged(QObject *);
     Q_REVISION(2, 3) void screenChanged();
 
+    void xChanged(int arg);
+    void yChanged(int arg);
+    Q_REVISION(6, 7) void zChanged();
+
 protected:
     void classBegin() override;
     void componentComplete() override;
 
+    bool event(QEvent *) override;
+
     QQuickWindowQmlImpl(QQuickWindowQmlImplPrivate &dd, QWindow *parent);
 
 private Q_SLOTS:
-    void setWindowVisibility();
+    Q_REVISION(6, 7) void applyWindowVisibility();
+    Q_REVISION(6, 7) void updateTransientParent();
 
 private:
     bool transientParentVisible();
+    void applyVisualParent();
 
 private:
     Q_DISABLE_COPY(QQuickWindowQmlImpl)
@@ -80,6 +104,4 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickWindowQmlImpl)
-
 #endif