From 448b2a5d838d082c66ab649cc7b71c31761bf409 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 4 Mar 2020 14:54:54 +0100 Subject: Replace QFlagPointer with QTaggedPointer The latter has the advantage of allowing the use of a real type for the tag, instead of the generic flag/flag2 boolean accessors. Change-Id: Icc9e854ce4af3eb5808a4bed45aa22f377e223da Reviewed-by: Fabian Kosmale --- src/quick/items/qquickitem.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/quick/items/qquickitem.cpp') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 93f1765811..707f149baf 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7292,10 +7292,7 @@ Qt::MouseButtons QQuickItem::acceptedMouseButtons() const void QQuickItem::setAcceptedMouseButtons(Qt::MouseButtons buttons) { Q_D(QQuickItem); - if (buttons & Qt::LeftButton) - d->extra.setFlag(); - else - d->extra.clearFlag(); + d->extra.setTag(d->extra.tag().setFlag(QQuickItemPrivate::LeftMouseButtonAccepted, buttons & Qt::LeftButton)); buttons &= ~Qt::LeftButton; if (buttons || d->extra.isAllocated()) -- cgit v1.2.3