diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-07 17:38:12 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-07 17:38:12 (GMT) |
| commit | 332c194a66ef37179c3267c2f4acd1f6b6feb7f3 (patch) | |
| tree | 3b363d2f173acf903ce0b7ee77a18bc103ffb5e3 /src/gui/kernel/qgesturemanager.cpp | |
| parent | 415ad7b69d364c41156d35b98790b02667a6671b (diff) | |
| parent | 77fb7ffa69fe0183e8547fca69fc976364d05408 (diff) | |
| download | Qt-332c194a66ef37179c3267c2f4acd1f6b6feb7f3.zip Qt-332c194a66ef37179c3267c2f4acd1f6b6feb7f3.tar.gz Qt-332c194a66ef37179c3267c2f4acd1f6b6feb7f3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index cb4061e..5c80340 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -162,7 +162,7 @@ void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType typ QMap<ObjectGesture, QList<QGesture *> >::Iterator iter = m_objectGestures.begin(); while (iter != m_objectGestures.end()) { ObjectGesture objectGesture = iter.key(); - if (objectGesture.gesture == type && target == objectGesture.object.data()) { + if (objectGesture.gesture == type && target == objectGesture.object) { QSet<QGesture *> gestures = iter.value().toSet(); for (QHash<QGestureRecognizer *, QSet<QGesture *> >::iterator it = m_obsoleteGestures.begin(), e = m_obsoleteGestures.end(); it != e; ++it) { @@ -172,6 +172,7 @@ void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType typ m_deletedRecognizers.remove(g); m_gestureToRecognizer.remove(g); } + qDeleteAll(gestures); iter = m_objectGestures.erase(iter); } else { |