aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickswitch.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-09-06 18:52:28 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-09-06 20:27:00 +0200
commit86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (patch)
treec1c4ac6daa87042196fa66a92ea56737930c0920 /src/quicktemplates2/qquickswitch.cpp
parent9a55b34e292c725a4fa394a71e0a3d851e4e488f (diff)
parent9ae57848671419b2622e254af8642fef7b1b7c33 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Diffstat (limited to 'src/quicktemplates2/qquickswitch.cpp')
-rw-r--r--src/quicktemplates2/qquickswitch.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index cb966568..37ae53f0 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -126,6 +126,7 @@ bool QQuickSwitchPrivate::handleMousePressEvent(QQuickItem *child, QMouseEvent *
pressPoint = event->pos();
q->setPressed(true);
+ emit q->pressed();
event->accept();
return true;
}
@@ -155,11 +156,14 @@ bool QQuickSwitchPrivate::handleMouseReleaseEvent(QQuickItem *child, QMouseEvent
q->setChecked(position > 0.5);
q->setPosition(checked ? 1.0 : 0.0);
child->setKeepMouseGrab(false);
- if (wasChecked != checked)
+ if (wasChecked != checked) {
+ emit q->released();
emit q->clicked();
+ }
event->accept();
} else {
q->toggle();
+ emit q->released();
emit q->clicked();
event->accept();
}