diff -r 5dc02b23752f -r 3e2da88830cd src/gui/kernel/qgesture.h --- a/src/gui/kernel/qgesture.h Tue Jul 06 15:10:48 2010 +0300 +++ b/src/gui/kernel/qgesture.h Wed Aug 18 10:37:55 2010 +0300 @@ -49,6 +49,8 @@ #include #include +#ifndef QT_NO_GESTURES + QT_BEGIN_HEADER Q_DECLARE_METATYPE(Qt::GestureState) @@ -132,6 +134,7 @@ { Q_OBJECT Q_DECLARE_PRIVATE(QPinchGesture) + Q_FLAGS(ChangeFlags ChangeFlag) public: enum ChangeFlag { @@ -189,6 +192,8 @@ friend class QPinchGestureRecognizer; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QPinchGesture::ChangeFlags) + QT_END_NAMESPACE Q_DECLARE_METATYPE(QPinchGesture::ChangeFlags) @@ -250,6 +255,9 @@ QPointF position() const; void setPosition(const QPointF &pos); + static void setTimeout(int msecs); + static int timeout(); + friend class QTapAndHoldGestureRecognizer; }; @@ -258,4 +266,6 @@ Q_DECLARE_METATYPE(QGesture::GestureCancelPolicy) QT_END_HEADER +#endif // QT_NO_GESTURES + #endif // QGESTURE_H