diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-25 14:26:31 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-25 14:26:37 +0100 |
| commit | 22769ac6a7667bf1d2d5b5e6421a15e4f6aadce1 (patch) | |
| tree | dc76832e65fae17b99089d9cf7b41ef87aad1e7e /src/quicktemplates2/qquickabstractbutton.cpp | |
| parent | eba5b547e7f1c3817d172936293e03535225f8ee (diff) | |
| parent | ac99683595e27b4157f9fd397fefa378955e275c (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If528b9f4e502c50e0cd76df75404e257232f0d18
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 350af84a..ffd8efa2 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -555,7 +555,7 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event) bool wasPressed = d->pressed; setPressed(false); - if (d->keepPressed || contains(event->pos())) + if (!d->wasHeld && (d->keepPressed || contains(event->pos()))) nextCheckState(); if (wasPressed) { |