diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-28 11:48:08 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-28 11:15:48 +0000 |
| commit | 52d9a725098735e6350fe63cf471a27d4106ad18 (patch) | |
| tree | 55c61ad0e73a63cc4f79eecc99860b228a93d014 /src/quick/items/qquickitem.h | |
| parent | c8702adf3140db887ea00f1520ae750fc4492b4c (diff) | |
finish renaming of containsMask -> containmentMask
Followup to 6fa746fa6 to rename setContainsMask and
registerAsContainsMask
Change-Id: Ifdfaf58dccb5fd3665615418e7f1ea09cb914c55
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/quick/items/qquickitem.h')
| -rw-r--r-- | src/quick/items/qquickitem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 85dddd30e3..cfdb2ad5b7 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -144,7 +144,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_PROPERTY(bool antialiasing READ antialiasing WRITE setAntialiasing NOTIFY antialiasingChanged RESET resetAntialiasing) Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged) Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged) - Q_PROPERTY(QObject *containmentMask READ containmentMask WRITE setContainsMask NOTIFY containmentMaskChanged REVISION 11) + Q_PROPERTY(QObject *containmentMask READ containmentMask WRITE setContainmentMask NOTIFY containmentMaskChanged REVISION 11) Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL) @@ -322,7 +322,7 @@ public: Q_INVOKABLE virtual bool contains(const QPointF &point) const; QObject *containmentMask() const; - void setContainsMask(QObject *mask); + void setContainmentMask(QObject *mask); QTransform itemTransform(QQuickItem *, bool *) const; QPointF mapToItem(const QQuickItem *item, const QPointF &point) const; |