aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 08:02:39 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-27 14:00:24 +0000
commit6fa746fa61e35dc26e5286250ddc9488546f5b66 (patch)
tree0669fe601b524fbab3e067ca83729fc73c08af28 /src/quick/items/qquickitem.cpp
parentf010b360c3b9929550ee1768c0eddd2a85345da6 (diff)
rename containsMask to containmentMask
It was pointed out that containsMask sounds like it ought to be a boolean property. Change-Id: I2b56823b60d64f9903b0d5108c6428e691c09ed0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r--src/quick/items/qquickitem.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 3a88c49e8d..11be8633f0 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -7616,7 +7616,7 @@ bool QQuickItem::contains(const QPointF &point) const
}
/*!
- \qmlproperty QObject * QtQuick::Item::containsMask
+ \qmlproperty QObject * QtQuick::Item::containmentMask
\since 5.11
This property holds an optional mask for the Item to be used in the
QtQuick::Item::contains method.
@@ -7624,19 +7624,19 @@ bool QQuickItem::contains(const QPointF &point) const
an input event has landed into the item or not.
By default the \l contains method will return true for any point
- within the Item's bounding box. \c containsMask allows for a
+ within the Item's bounding box. \c containmentMask allows for a
more fine-grained control. For example, the developer could
- define and use an AnotherItem element as containsMask,
+ define and use an AnotherItem element as containmentMask,
which has a specialized contains method, like:
\code
- Item { id: item; containsMask: AnotherItem { id: anotherItem } }
+ Item { id: item; containmentMask: AnotherItem { id: anotherItem } }
\endcode
\e{item}'s contains method would then return true only if
\e{anotherItem}'s contains implementation returns true.
*/
-QObject *QQuickItem::containsMask() const
+QObject *QQuickItem::containmentMask() const
{
Q_D(const QQuickItem);
return d->mask.data();
@@ -7669,7 +7669,7 @@ void QQuickItem::setContainsMask(QObject *mask)
QQuickItemPrivate *maskPrivate = QQuickItemPrivate::get(quickMask);
maskPrivate->registerAsContainsMask(this, true); // telling maskPrivate that "this" is using it as mask
}
- emit containsMaskChanged();
+ emit containmentMaskChanged();
}
/*!