summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager_p.h
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2009-11-04 13:02:41 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2009-11-04 13:02:41 (GMT)
commit94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (patch)
tree74009d7bd395e7bd39076875914c5f1353a30902 /src/gui/kernel/qgesturemanager_p.h
parent3c3db55c205012de15bab758b3bb4857d132cb98 (diff)
parent51c9b68425c1d3fe64a08e6ef0357fbd6bdd8f8a (diff)
downloadQt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.zip
Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.tar.gz
Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.tar.bz2
Merge commit '51c9b68' into 4.6
Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
Diffstat (limited to 'src/gui/kernel/qgesturemanager_p.h')
-rw-r--r--src/gui/kernel/qgesturemanager_p.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index 1e0734b..4efa10b 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -78,11 +78,12 @@ public:
bool filterEvent(QGraphicsObject *receiver, QEvent *event);
#endif //QT_NO_GRAPHICSVIEW
- // declared in qapplication.cpp
static QGestureManager* instance();
void cleanupCachedGestures(QObject *target, Qt::GestureType type);
+ void recycle(QGesture *gesture);
+
protected:
void timerEvent(QTimerEvent *event);
bool filterEventThroughContexts(const QMultiHash<QObject *, Qt::GestureType> &contexts,
@@ -141,6 +142,8 @@ private:
void cancelGesturesForChildren(QGesture *originatingGesture);
};
+extern QGestureManager *qt_gestureManager;
+
QT_END_NAMESPACE
#endif // QGESTUREMANAGER_P_H