diff options
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 420b13eeff..5063b3b5db 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -64,7 +64,7 @@ class Q_QUICK_EXPORT QQuickWindow : public QWindow Q_OBJECT Q_PRIVATE_PROPERTY(QQuickWindow::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) - Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT FINAL) + Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT) Q_PROPERTY(QQuickItem* activeFocusItem READ activeFocusItem NOTIFY activeFocusItemChanged REVISION 1) Q_CLASSINFO("DefaultProperty", "data") Q_DECLARE_PRIVATE(QQuickWindow) @@ -143,7 +143,6 @@ Q_SIGNALS: public Q_SLOTS: void update(); - void forcePolish(); void releaseResources(); protected: @@ -173,11 +172,12 @@ protected: private Q_SLOTS: void maybeUpdate(); void cleanupSceneGraph(); + void forcePolish(); void setTransientParent_helper(QQuickWindow *window); private: friend class QQuickItem; - friend class QQuickWindowRenderLoop; + friend class QQuickAnimatorController; Q_DISABLE_COPY(QQuickWindow) }; |