summaryrefslogtreecommitdiffstats
path: root/scroller
diff options
context:
space:
mode:
authorRobert Griebl <rgriebl@trolltech.com>2010-04-19 15:51:23 +0200
committerRobert Griebl <rgriebl@trolltech.com>2010-04-19 15:51:23 +0200
commit668581db5b42ad69397749bf2055e8c3747f38b0 (patch)
tree7e38ff62f4b7fd608c2da7bbf6a523ec408531f0 /scroller
parent86b3be1d424eb563cd4150d87b9c4a823abca9d8 (diff)
use QTime instead of QElapsedTimer on Qt versions prior to 4.7
Diffstat (limited to 'scroller')
-rw-r--r--scroller/qkineticscroller_p.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/scroller/qkineticscroller_p.h b/scroller/qkineticscroller_p.h
index 881ee14..885f539 100644
--- a/scroller/qkineticscroller_p.h
+++ b/scroller/qkineticscroller_p.h
@@ -55,7 +55,11 @@
#include <QObject>
#include <qkineticscroller.h>
#include <QEvent>
-#include <QElapsedTimer>
+#if QT_VERSION < 0x040700
+# include <QTime>
+#else
+# include <QElapsedTimer>
+#endif
QT_BEGIN_NAMESPACE
@@ -138,8 +142,13 @@ public:
qreal pixelPerMeter;
+#if QT_VERSION < 0x040700
+ QTime scrollRelativeTimer;
+ QTime scrollAbsoluteTimer;
+#else
QElapsedTimer scrollRelativeTimer;
QElapsedTimer scrollAbsoluteTimer;
+#endif
QPointF releaseVelocity; // the starting velocity of the scrolling state
QPointF overshootVelocity; // the starting velocity when going into overshoot
qreal overshootStartTimeX;