Merge of the maemo-gestures branch onto qt/4.5.0

This is a squashed merge of all of the changes in the maemo-gestures
branch on-top of the qt/4.5.0 branch.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 1635f8a..5747c3c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1550,6 +1550,21 @@ public:
         TouchPointStationary,
         TouchPointReleased
     };
+
+    typedef QString GestureType;
+    static const char UnknownGesture[] = "???";
+    static const char Tap[] = "Tap";
+    static const char DoubleTap[] = "DoubleTap";
+    static const char LongTap[] = "LongTap";
+    static const char Pan[] = "Pan";
+    static const char Pinch[] = "Pinch";
+
+    enum GestureState
+    {
+        GestureStarted = 0,
+        GestureFinished = 1
+    };
+
 }
 #ifdef Q_MOC_RUN
  ;