aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickflickable_p_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
-rw-r--r--src/quick/items/qquickflickable_p_p.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index 8ceea6162f..69fad683df 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -183,10 +183,11 @@ public:
bool interactive : 1;
bool calcVelocity : 1;
bool pixelAligned : 1;
- QElapsedTimer lastPosTime;
+ QElapsedTimer timer;
+ qint64 lastPosTime;
+ qint64 lastPressTime;
QPointF lastPos;
QPointF pressPos;
- QElapsedTimer pressTime;
qreal deceleration;
qreal maxVelocity;
QElapsedTimer velocityTime;
@@ -215,6 +216,8 @@ public:
void handleMouseMoveEvent(QMouseEvent *);
void handleMouseReleaseEvent(QMouseEvent *);
+ qint64 computeCurrentTime(QInputEvent *event);
+
// flickableData property
static void data_append(QDeclarativeListProperty<QObject> *, QObject *);
static int data_count(QDeclarativeListProperty<QObject> *);