diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-29 13:01:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-29 13:01:22 +0100 |
| commit | 1e421097f08876f5e2242be6f7a20db2aeb51692 (patch) | |
| tree | c45b9323368cfdede67facd43c076a85322f12f6 /src/quick/items/qquickanimatedsprite_p.h | |
| parent | f4788a13e98aa4e5438327094524d7b8239893ec (diff) | |
| parent | 666bc731a0ba930ca0cfda18daf836913fd91361 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
Diffstat (limited to 'src/quick/items/qquickanimatedsprite_p.h')
| -rw-r--r-- | src/quick/items/qquickanimatedsprite_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index b2633619d5..6b49d903df 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -53,7 +53,7 @@ #include <QtQuick/QQuickItem> #include <private/qquicksprite_p.h> -#include <QTime> +#include <QtCore/qelapsedtimer.h> QT_BEGIN_NAMESPACE @@ -372,7 +372,7 @@ private: QQuickAnimatedSpriteMaterial *m_material; QQuickSprite* m_sprite; QQuickSpriteEngine* m_spriteEngine; - QTime m_timestamp; + QElapsedTimer m_timestamp; int m_curFrame; bool m_pleaseReset; bool m_running; |