diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 19:44:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 19:44:14 (GMT) |
| commit | 1b906e167c4eec4a8b4e99f97faad3a0f095b51b (patch) | |
| tree | c17c809d6b96e19625116ff38fb21181e2f554a0 /src/gui/kernel/qgesturemanager_p.h | |
| parent | bfb6d648a548c25cdead72047ef0a712a45832ea (diff) | |
| parent | 149cfee3fea478640384559e69209a16bfda44a9 (diff) | |
| download | Qt-1b906e167c4eec4a8b4e99f97faad3a0f095b51b.zip Qt-1b906e167c4eec4a8b4e99f97faad3a0f095b51b.tar.gz Qt-1b906e167c4eec4a8b4e99f97faad3a0f095b51b.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 QGesture autotest for QGesture lazy deletion.
Crash fix, when the Object will be deleted during handling a QGestureEvent.
Diffstat (limited to 'src/gui/kernel/qgesturemanager_p.h')
| -rw-r--r-- | src/gui/kernel/qgesturemanager_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h index 0d84b67..a5a3482 100644 --- a/src/gui/kernel/qgesturemanager_p.h +++ b/src/gui/kernel/qgesturemanager_p.h @@ -130,6 +130,7 @@ private: QHash<QGestureRecognizer *, QSet<QGesture *> > m_obsoleteGestures; QHash<QGesture *, QGestureRecognizer *> m_deletedRecognizers; + QSet<QGesture *> m_gesturesToDelete; void cleanupGesturesForRemovedRecognizer(QGesture *gesture); QGesture *getState(QObject *widget, QGestureRecognizer *recognizer, |