--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h	Wed Aug 18 10:37:55 2010 +0300
@@ -125,7 +125,7 @@
     void itemGeometryChanged(QDeclarativeItem *, const QRectF &, const QRectF &);
 
 public:
-    QDeclarativeItem *viewport;
+    QDeclarativeItem *contentItem;
 
     AxisData hData;
     AxisData vData;
@@ -140,13 +140,13 @@
     bool stealMouse : 1;
     bool pressed : 1;
     bool interactive : 1;
-    QTime lastPosTime;
+    QElapsedTimer lastPosTime;
     QPointF lastPos;
     QPointF pressPos;
-    QTime pressTime;
+    QElapsedTimer pressTime;
     qreal deceleration;
     qreal maxVelocity;
-    QTime velocityTime;
+    QElapsedTimer velocityTime;
     QPointF lastFlickablePosition;
     qreal reportedVelocitySmoothing;
     QGraphicsSceneMouseEvent *delayedPressEvent;