diff options
| author | Alan Alpert <416365416c@gmail.com> | 2014-08-06 21:18:45 -0700 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-08-12 10:20:37 +0200 |
| commit | 70d73e8ee4cbe87d2980a9ec1208515ef212119b (patch) | |
| tree | 8d68f4cfb3d1348e56b949d9450e5cf25901257e /src | |
| parent | 74f483f23140aaf77ab062bd53478cbb949fd2e2 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.h | 2 |
2 files changed, 0 insertions, 8 deletions
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 @@ -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 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) |