diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 22:47:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 22:47:45 (GMT) |
| commit | 75dc699c18ec8c665bb92685da38fbc2917f83e6 (patch) | |
| tree | c928710e37f16cb52421690d2a8399afc4b257f7 | |
| parent | 894e3c41af88a0bbfa2fc63fe3872ed27ab7a3dc (diff) | |
| parent | 7c59ffa73a569cb18acb05a1ee6c566f4878a1e2 (diff) | |
| download | Qt-75dc699c18ec8c665bb92685da38fbc2917f83e6.zip Qt-75dc699c18ec8c665bb92685da38fbc2917f83e6.tar.gz Qt-75dc699c18ec8c665bb92685da38fbc2917f83e6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed random crash in QGestureManager.
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index 6dd8127..5e9a0cb 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -171,6 +171,10 @@ void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType typ foreach (QGesture *g, gestures) { m_deletedRecognizers.remove(g); m_gestureToRecognizer.remove(g); + m_maybeGestures.remove(g); + m_activeGestures.remove(g); + m_gestureOwners.remove(g); + m_gestureTargets.remove(g); } qDeleteAll(gestures); |