diff options
| -rw-r--r-- | examples/quick/shapes/content/tapableTriangle.qml | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 12 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.h | 6 | ||||
| -rw-r--r-- | tests/auto/quick/qquickmousearea/data/mask.qml | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/examples/quick/shapes/content/tapableTriangle.qml b/examples/quick/shapes/content/tapableTriangle.qml index 274552f525..be48e23876 100644 --- a/examples/quick/shapes/content/tapableTriangle.qml +++ b/examples/quick/shapes/content/tapableTriangle.qml @@ -56,7 +56,7 @@ Rectangle { width: 120 height: 120 color: th.pressed ? "steelBlue" : "lightGray" - containsMask: ctr + containmentMask: ctr TapHandler { id: th } 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(); } /*! diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index f79965c8d3..85dddd30e3 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 *containsMask READ containsMask WRITE setContainsMask NOTIFY containsMaskChanged REVISION 11) + Q_PROPERTY(QObject *containmentMask READ containmentMask WRITE setContainsMask NOTIFY containmentMaskChanged REVISION 11) Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL) @@ -321,7 +321,7 @@ public: QSharedPointer<QQuickItemGrabResult> grabToImage(const QSize &targetSize = QSize()); Q_INVOKABLE virtual bool contains(const QPointF &point) const; - QObject *containsMask() const; + QObject *containmentMask() const; void setContainsMask(QObject *mask); QTransform itemTransform(QQuickItem *, bool *) const; @@ -393,7 +393,7 @@ Q_SIGNALS: void zChanged(); void implicitWidthChanged(); void implicitHeightChanged(); - Q_REVISION(11) void containsMaskChanged(); + Q_REVISION(11) void containmentMaskChanged(); protected: bool event(QEvent *) override; diff --git a/tests/auto/quick/qquickmousearea/data/mask.qml b/tests/auto/quick/qquickmousearea/data/mask.qml index 23e93f0310..ec315c2a63 100644 --- a/tests/auto/quick/qquickmousearea/data/mask.qml +++ b/tests/auto/quick/qquickmousearea/data/mask.qml @@ -55,7 +55,7 @@ Item { onClicked: { root.clicked++ } onReleased: { root.released++ } - containsMask: CircleMask { + containmentMask: CircleMask { radius: mouseArea.width/2 } } |