diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-21 14:26:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-21 14:30:29 +0200 |
| commit | cc1b216c52d42964c9ac816302414cc6ec376dfe (patch) | |
| tree | 4e282f89572881e963ca4aaf1f1dae44ec2d334a /src/quick/items/qquickitem.h | |
| parent | 0fadb710e5639dac9f17d6655eb9edeaadbcbc33 (diff) | |
| parent | 0af61d773fc7263573afc6b7a973451783bf7424 (diff) | |
Merge branch 'origin/5.4' into dev
This merges 0af61d773fc7263573afc6b7a973451783bf7424 since there is a
circular dependency introduced with a111b1b108f2d3344cb2b2b677e738fd9dd68945
in qtquickcontrols.
Change-Id: Ia4fcad8df69326fba3f6b5927151e9d98206e872
Diffstat (limited to 'src/quick/items/qquickitem.h')
| -rw-r--r-- | src/quick/items/qquickitem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 072e1aed75..67a34cc4fa 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) |