diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-16 17:27:50 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-16 17:27:50 (GMT) |
| commit | fbb94944ed1d0b86e2f13c9da8df0e3a7c5397b0 (patch) | |
| tree | b254b5e3400804bbf732fbcebd9c5e50393bd3c5 /src | |
| parent | ce7dcaf43089d6d0d4bb6029c42991cc6fec2576 (diff) | |
| parent | 45ed11461d479172d6a92e77b6e1a09916ca4556 (diff) | |
| download | Qt-fbb94944ed1d0b86e2f13c9da8df0e3a7c5397b0.zip Qt-fbb94944ed1d0b86e2f13c9da8df0e3a7c5397b0.tar.gz Qt-fbb94944ed1d0b86e2f13c9da8df0e3a7c5397b0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qmacgesturerecognizer_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac.mm b/src/gui/kernel/qmacgesturerecognizer_mac.mm index f142d71..3e0ba23 100644 --- a/src/gui/kernel/qmacgesturerecognizer_mac.mm +++ b/src/gui/kernel/qmacgesturerecognizer_mac.mm @@ -67,7 +67,7 @@ QMacSwipeGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *e case QNativeGestureEvent::Swipe: { QSwipeGesture *g = static_cast<QSwipeGesture *>(gesture); g->setSwipeAngle(ev->angle); - return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint; + return QGestureRecognizer::FinishGesture | QGestureRecognizer::ConsumeEventHint; break; } default: break; |