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 <gunnar.sletta@jollamobile.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index d1d9a7c..4f1bd8f 100644 (file)
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2563,12 +2563,6 @@ void QQuickItem::stackAfter(const QQuickItem *sibling)
 */
 
 /*!
-    \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.
 
   The item does not have a window until it has been assigned into a scene. The

diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index fee0498..c0923ad 100644 (file)
--- 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)