Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

1 files changed, 63 insertions, 19 deletions

diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index 02eb526..f995d7b 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -65,9 +65,9 @@ class Q_GUI_EXPORT QGesture : public QObject
 
     Q_PROPERTY(Qt::GestureState state READ state)
     Q_PROPERTY(Qt::GestureType gestureType READ gestureType)
+    Q_PROPERTY(QGesture::GestureCancelPolicy gestureCancelPolicy READ gestureCancelPolicy WRITE setGestureCancelPolicy)
     Q_PROPERTY(QPointF hotSpot READ hotSpot WRITE setHotSpot RESET unsetHotSpot)
     Q_PROPERTY(bool hasHotSpot READ hasHotSpot)
-    Q_PROPERTY(QObject* targetObject READ targetObject WRITE setTargetObject)
 
 public:
     explicit QGesture(QObject *parent = 0);
@@ -77,14 +77,19 @@ public:
 
     Qt::GestureState state() const;
 
-    QObject *targetObject() const;
-    void setTargetObject(QObject *value);
-
     QPointF hotSpot() const;
     void setHotSpot(const QPointF &value);
     bool hasHotSpot() const;
     void unsetHotSpot();
 
+    enum GestureCancelPolicy {
+        CancelNone = 0,
+        CancelAllInContext
+    };
+
+    void setGestureCancelPolicy(GestureCancelPolicy policy);
+    GestureCancelPolicy gestureCancelPolicy() const;
+
 protected:
     QGesture(QGesturePrivate &dd, QObject *parent);
 
@@ -92,6 +97,7 @@ private:
     friend class QGestureEvent;
     friend class QGestureRecognizer;
     friend class QGestureManager;
+    friend class QGraphicsScenePrivate;
 };
 
 class QPanGesturePrivate;
@@ -100,22 +106,21 @@ class Q_GUI_EXPORT QPanGesture : public QGesture
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPanGesture)
 
-    Q_PROPERTY(QSizeF totalOffset READ totalOffset WRITE setTotalOffset)
-    Q_PROPERTY(QSizeF lastOffset READ lastOffset WRITE setLastOffset)
-    Q_PROPERTY(QSizeF offset READ offset WRITE setOffset)
+    Q_PROPERTY(QPointF lastOffset READ lastOffset WRITE setLastOffset)
+    Q_PROPERTY(QPointF offset READ offset WRITE setOffset)
+    Q_PROPERTY(QPointF delta READ delta STORED false)
     Q_PROPERTY(qreal acceleration READ acceleration WRITE setAcceleration)
 
 public:
     QPanGesture(QObject *parent = 0);
 
-    QSizeF totalOffset() const;
-    QSizeF lastOffset() const;
-    QSizeF offset() const;
+    QPointF lastOffset() const;
+    QPointF offset() const;
+    QPointF delta() const;
     qreal acceleration() const;
 
-    void setTotalOffset(const QSizeF &value);
-    void setLastOffset(const QSizeF &value);
-    void setOffset(const QSizeF &value);
+    void setLastOffset(const QPointF &value);
+    void setOffset(const QPointF &value);
     void setAcceleration(qreal value);
 
     friend class QPanGestureRecognizer;
@@ -129,14 +134,15 @@ class Q_GUI_EXPORT QPinchGesture : public QGesture
     Q_DECLARE_PRIVATE(QPinchGesture)
 
 public:
-    enum WhatChange {
+    enum ChangeFlag {
         ScaleFactorChanged = 0x1,
         RotationAngleChanged = 0x2,
         CenterPointChanged = 0x4
     };
-    Q_DECLARE_FLAGS(WhatChanged, WhatChange)
+    Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag)
 
-    Q_PROPERTY(WhatChanged whatChanged READ whatChanged WRITE setWhatChanged)
+    Q_PROPERTY(ChangeFlags totalChangeFlags READ totalChangeFlags WRITE setTotalChangeFlags)
+    Q_PROPERTY(ChangeFlags changeFlags READ changeFlags WRITE setChangeFlags)
 
     Q_PROPERTY(qreal totalScaleFactor READ totalScaleFactor WRITE setTotalScaleFactor)
     Q_PROPERTY(qreal lastScaleFactor READ lastScaleFactor WRITE setLastScaleFactor)
@@ -153,8 +159,11 @@ public:
 public:
     QPinchGesture(QObject *parent = 0);
 
-    WhatChanged whatChanged() const;
-    void setWhatChanged(WhatChanged value);
+    ChangeFlags totalChangeFlags() const;
+    void setTotalChangeFlags(ChangeFlags value);
+
+    ChangeFlags changeFlags() const;
+    void setChangeFlags(ChangeFlags value);
 
     QPointF startCenterPoint() const;
     QPointF lastCenterPoint() const;
@@ -182,7 +191,7 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QPinchGesture::WhatChanged)
+Q_DECLARE_METATYPE(QPinchGesture::ChangeFlags)
 
 QT_BEGIN_NAMESPACE
 
@@ -210,8 +219,43 @@ public:
     friend class QSwipeGestureRecognizer;
 };
 
+class QTapGesturePrivate;
+class Q_GUI_EXPORT QTapGesture : public QGesture
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QTapGesture)
+
+    Q_PROPERTY(QPointF position READ position WRITE setPosition)
+
+public:
+    QTapGesture(QObject *parent = 0);
+
+    QPointF position() const;
+    void setPosition(const QPointF &pos);
+
+    friend class QTapGestureRecognizer;
+};
+
+class QTapAndHoldGesturePrivate;
+class Q_GUI_EXPORT QTapAndHoldGesture : public QGesture
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QTapAndHoldGesture)
+
+    Q_PROPERTY(QPointF position READ position WRITE setPosition)
+
+public:
+    QTapAndHoldGesture(QObject *parent = 0);
+
+    QPointF position() const;
+    void setPosition(const QPointF &pos);
+
+    friend class QTapAndHoldGestureRecognizer;
+};
+
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QGesture::GestureCancelPolicy)
 QT_END_HEADER
 
 #endif // QGESTURE_H