summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager.cpp
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-06-03 19:04:10 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-06-15 12:48:57 (GMT)
commit37bb264e777e6b46749963e99db2ce6e3835fa9b (patch)
tree239b538aae362b8ee1e07ea42dd5bbf6d072113f /src/gui/kernel/qgesturemanager.cpp
parent336dfcef05cb63df0a6d550b59a4badc7a0f01c1 (diff)
downloadQt-37bb264e777e6b46749963e99db2ce6e3835fa9b.zip
Qt-37bb264e777e6b46749963e99db2ce6e3835fa9b.tar.gz
Qt-37bb264e777e6b46749963e99db2ce6e3835fa9b.tar.bz2
Set the gesture manager state before sending an event
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
-rw-r--r--src/gui/kernel/qgesturemanager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 799bcfd..a1d55fa 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -176,8 +176,6 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
gesture->d_func()->singleshot = false;
}
}
- Q_ASSERT(!started.isEmpty());
- ret = sendGestureEvent(receiver, started, QSet<QGesture*>());
if (!activeGestures.isEmpty()) {
DEBUG() << "QGestureManager: new state = Gesture";
@@ -189,6 +187,9 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
DEBUG() << "QGestureManager: new state = NotGesture";
state = NotGesture;
}
+
+ Q_ASSERT(!started.isEmpty());
+ ret = sendGestureEvent(receiver, started, QSet<QGesture*>());
} else if (!maybeGestures.isEmpty()) {
if (state != MaybeGesture) {
// We got a new set of events that look like a start