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

1 files changed, 10 insertions, 15 deletions

diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/gui/kernel/qstandardgestures_p.h
index 5fbcc5d..0a4debe 100644
--- a/src/gui/kernel/qstandardgestures_p.h
+++ b/src/gui/kernel/qstandardgestures_p.h
@@ -61,6 +61,7 @@
 #include "qgesture_p.h"
 
 #include "qstandardgestures.h"
+#include "qbasictimer.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -69,21 +70,15 @@ class QPanGesturePrivate : public QGesturePrivate
     Q_DECLARE_PUBLIC(QPanGesture)
 
 public:
-    QPanGesturePrivate()
-    {
-#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
-        panFinishedTimer = 0;
-#endif
-    }
-
     void setupGestureTarget(QObject *o);
 
-    QSize totalOffset;
-    QSize lastOffset;
-    QPoint lastPosition;
+    QSizeF totalOffset;
+    QSizeF lastOffset;
+    QPointF lastPosition;
 
-#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
-    int panFinishedTimer;
+#if defined(QT_MAC_USE_COCOA)
+    QBasicTimer singleTouchPanTimer;
+    QPointF prevMousePos;
 #endif
 };
 
@@ -107,9 +102,9 @@ public:
     qreal lastScaleFactor;
     qreal rotationAngle;
     qreal lastRotationAngle;
-    QPoint startCenterPoint;
-    QPoint lastCenterPoint;
-    QPoint centerPoint;
+    QPointF startCenterPoint;
+    QPointF lastCenterPoint;
+    QPointF centerPoint;
 #ifdef Q_WS_WIN
     int initialDistance;
 #endif