diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-11-10 04:49:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-11-10 04:49:00 (GMT) |
| commit | d19717e909a2f1f8e5ed11e27fb3b9a3f7792931 (patch) | |
| tree | b95ae86adecc1f80d7e23d4036b8077a74bfd18f | |
| parent | 7b411d9f5364391318424c64218fbcd84ea79d03 (diff) | |
| parent | 9bc46788f3b0f4a652be604d3facbcd84602677a (diff) | |
| download | Qt-d19717e909a2f1f8e5ed11e27fb3b9a3f7792931.zip Qt-d19717e909a2f1f8e5ed11e27fb3b9a3f7792931.tar.gz Qt-d19717e909a2f1f8e5ed11e27fb3b9a3f7792931.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/audio/audio.pri | 4 |
2 files changed, 6 insertions, 2 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); diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index ae28a26..7b2f9ad 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -42,8 +42,8 @@ mac { wince*:LIBS += -lcoredll } else:symbian { - INCLUDEPATH += /epoc32/include/mmf/common - INCLUDEPATH += /epoc32/include/mmf/server + INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common + INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server HEADERS += $$PWD/qaudio_symbian_p.h \ $$PWD/qaudiodeviceinfo_symbian_p.h \ |