diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-10 14:49:25 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-10 14:49:25 +0000 |
| commit | 8fe6b4d3ef03955c23a1d8816d4c947efbde381b (patch) | |
| tree | bb077d2bfa9c2d922eb83cb386859162aa3a63c1 /src/quick/items/qquickmousearea.cpp | |
| parent | bae22adafc3a6f5ff7f920e71c1542dc25cf1bab (diff) | |
| parent | 102fa9b6db82ecd2b95d168912fde0c8bc3798b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index b377390535..6bd83dd808 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -673,6 +673,7 @@ void QQuickMouseArea::mousePressEvent(QMouseEvent *event) Q_D(QQuickMouseArea); d->moved = false; d->stealMouse = d->preventStealing; + d->overThreshold = false; if (!d->enabled || !(event->button() & acceptedMouseButtons())) { QQuickItem::mousePressEvent(event); } else { @@ -958,6 +959,7 @@ bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event) if (!d->pressed) { // no other buttons are pressed d->stealMouse = false; + d->overThreshold = false; if (c && c->mouseGrabberItem() == this) ungrabMouse(); emit canceled(); |