From 388fc07cf28417f6e755ad8a105a71aa55ab13c8 Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Fri, 18 Oct 2013 15:21:43 +0200 Subject: Don't let contentItem be FINAL in order to allow shadowing. For subclasses that adds menubars, toolbars etc, the plan is to expose another item (the item excluding the menubars, toolbars) as a contentItem. Task-number: QTBUG-32443 Change-Id: Id12fc50efde3fdf363e4528dd5de17177ddef24f Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> --- src/quick/items/qquickwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/items/qquickwindow.h') diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 420b13eeff..6fd01a3119 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 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) -- cgit v1.2.3