summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-05-07 14:04:17 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2018-05-13 18:39:41 +0000
commit28d849c059dfe6bf957cb1fe46e66815c87d50e9 (patch)
treeb1ff2896a7f6a991292df1ea9d8eb048d27150da
parent6888f9b025bdfd1a256ddbc2dc1bb8e7dd66af61 (diff)
MouseArea: set pressed state to Qt::NoButton not nullptr
Correction to 499ec43937e926e4f2fa57a9baa455fcb3862262 Change-Id: I9f9fb7cf3a0a04611e7f0a31f57147fbbc03c1a5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--src/quick/items/qquickmousearea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 052da9fe82..c9316c0406 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -910,7 +910,7 @@ void QQuickMouseArea::ungrabMouse()
if (d->pressed) {
// if our mouse grab has been removed (probably by Flickable), fix our
// state
- d->pressed = nullptr;
+ d->pressed = Qt::NoButton;
d->stealMouse = false;
d->doubleClick = false;
d->overThreshold = false;