summaryrefslogtreecommitdiffstats
path: root/testapp
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 /testapp
parent86b3be1d424eb563cd4150d87b9c4a823abca9d8 (diff)
use QTime instead of QElapsedTimer on Qt versions prior to 4.7
Diffstat (limited to 'testapp')
-rw-r--r--testapp/qscrollareakineticscroller.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/testapp/qscrollareakineticscroller.cpp b/testapp/qscrollareakineticscroller.cpp
index ecef0c6..a1ed70d 100644
--- a/testapp/qscrollareakineticscroller.cpp
+++ b/testapp/qscrollareakineticscroller.cpp
@@ -48,7 +48,11 @@
#include <QPointF>
#include <QPointer>
#include <QMouseEvent>
-#include <QElapsedTimer>
+#if QT_VERSION < 0x040700
+# include <QTime>
+#else
+# include <QElapsedTimer>
+#endif
#include "qabstractitemview.h"
#include "qgraphicsview.h"
@@ -80,7 +84,11 @@ public:
QPointer<QWidget> childWidget; // the widget where the mouse was pressed
QPointF fractionalPosition;
+#if QT_VERSION < 0x040700
+ QTime timer;
+#else
QElapsedTimer timer;
+#endif
QScrollAreaKineticScrollerPrivate()
: q_ptr(0)