aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-07-26 16:28:19 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-26 09:37:52 +0200
commit83eb5ba0082cee15a5ca01000084c07fdb19af76 (patch)
treee2648984a93e5c967544aec495c15a02c41d13a7 /src
parent3870e1478b64627f247fe1aa482d50a4367c0523 (diff)
A long press should allow onClicked if there is no onPressAndHold
Fixes: QTBUG-19726 Change-Id: I896c9264c1cf408dcd533b5d6d463d53c785d787 Reviewed-on: http://codereview.qt.nokia.com/2155 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qsgmousearea.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp
index c4b7fc08ca..98ba7022ea 100644
--- a/src/declarative/items/qsgmousearea.cpp
+++ b/src/declarative/items/qsgmousearea.cpp
@@ -803,6 +803,8 @@ void QSGMouseArea::timerEvent(QTimerEvent *event)
emit pressAndHold(&me);
if (!me.isAccepted())
d->propagate(&me, QSGMouseAreaPrivate::PressAndHold);
+ if (!me.isAccepted()) // no one handled the long press - allow click
+ d->longPress = false;
}
}
}