From 70d73e8ee4cbe87d2980a9ec1208515ef212119b Mon Sep 17 00:00:00 2001 From: Alan Alpert <416365416c@gmail.com> Date: Wed, 6 Aug 2014 21:18:45 -0700 Subject: Remove Item.window Window is a type in a different import, so we can't just casually use it in Item. Note that this API was going to be new in the next release, so it can be safely removed (at least until we do it right). Change-Id: I9e3eb5f65ea5f46d30fb7905d0f9c479daaccbff Reviewed-by: Gunnar Sletta Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: J-P Nurmi Reviewed-by: Shawn Rutledge --- src/quick/items/qquickitem.cpp | 6 ------ src/quick/items/qquickitem.h | 2 -- 2 files changed, 8 deletions(-) (limited to 'src') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index d1d9a7cd71..4f1bd8f4a2 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2562,12 +2562,6 @@ void QQuickItem::stackAfter(const QQuickItem *sibling) This signal is emitted when the item's \a window changes. */ -/*! - \qmlproperty Window QtQuick::Item::window - \since 5.4 - This property holds the window in which the item is rendered. - */ - /*! Returns the window in which this item is rendered. diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index fee04984a4..c0923ad07c 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -147,8 +147,6 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged) Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged) - Q_PROPERTY(QQuickWindow *window READ window NOTIFY windowChanged REVISION 2) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL) Q_ENUMS(TransformOrigin) -- cgit v1.2.3