diff options
-rw-r--r-- | src/quick/items/qquickspriteengine.cpp | 12 | ||||
-rw-r--r-- | src/quick/items/qquickspriteengine_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquickspritesequence_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquickspritesequence_p_p.h | 3 | ||||
-rw-r--r-- | tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp | 4 | ||||
-rw-r--r-- | tools/qmlscene/main.cpp | 4 | ||||
-rw-r--r-- | tools/qmltime/qmltime.cpp | 4 |
7 files changed, 14 insertions, 18 deletions
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index be297bbe76..8c52703938 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -554,7 +554,7 @@ void QQuickStochasticEngine::restart(int index) bool randomStart = (m_startTimes.at(index) == NINF); m_startTimes[index] = m_timeOffset; if (m_addAdvance) - m_startTimes[index] += m_advanceTime.elapsed(); + m_startTimes[index] += m_advanceTimer.elapsed(); if (randomStart) m_startTimes[index] -= QRandomGenerator::global()->bounded(m_duration.at(index)); int time = m_duration.at(index) + m_startTimes.at(index); @@ -574,12 +574,12 @@ void QQuickSpriteEngine::restart(int index) //Reimplemented to recognize and han } else { m_startTimes[index] = m_timeOffset; if (m_addAdvance) - m_startTimes[index] += m_advanceTime.elapsed(); + m_startTimes[index] += m_advanceTimer.elapsed(); if (randomStart) m_startTimes[index] -= QRandomGenerator::global()->bounded(m_duration.at(index)); int time = spriteDuration(index) + m_startTimes.at(index); if (randomStart) { - int curTime = m_timeOffset + (m_addAdvance ? m_advanceTime.elapsed() : 0); + int curTime = m_timeOffset + (m_addAdvance ? m_advanceTimer.elapsed() : 0); while (time < curTime) //Fast forward through psuedostates as needed time += spriteDuration(index); } @@ -623,10 +623,10 @@ void QQuickSpriteEngine::advance(int idx) //Reimplemented to recognize and handl } //just go past the pseudostate logic } else if (m_startTimes.at(idx) + m_duration.at(idx) - > int(m_timeOffset + (m_addAdvance ? m_advanceTime.elapsed() : 0))) { + > int(m_timeOffset + (m_addAdvance ? m_advanceTimer.elapsed() : 0))) { //only a pseduostate ended emit stateChanged(idx); - addToUpdateList(spriteStart(idx) + spriteDuration(idx) + (m_addAdvance ? m_advanceTime.elapsed() : 0), idx); + addToUpdateList(spriteStart(idx) + spriteDuration(idx) + (m_addAdvance ? m_advanceTimer.elapsed() : 0), idx); return; } int nextIdx = nextState(m_things.at(idx), idx); @@ -685,7 +685,7 @@ uint QQuickStochasticEngine::updateSprites(uint time)//### would returning a lis } m_stateUpdates.remove(0, i); - m_advanceTime.start(); + m_advanceTimer.start(); m_addAdvance = true; if (m_stateUpdates.isEmpty()) return uint(-1); diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index d3944b4620..da505be911 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -58,7 +58,7 @@ QT_REQUIRE_CONFIG(quick_sprite); #include <QObject> #include <QVector> #include <QTimer> -#include <QTime> +#include <QElapsedTimer> #include <QList> #include <QQmlListProperty> #include <QImage> @@ -254,7 +254,7 @@ protected: QVector<int> m_startTimes; QVector<QPair<uint, QVector<int> > > m_stateUpdates;//### This could be done faster - priority queue? - QTime m_advanceTime; + QElapsedTimer m_advanceTimer; uint m_timeOffset; QString m_globalGoal; int m_maxFrames; diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index 899ce79e0e..12c80d6a27 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -56,7 +56,6 @@ QT_REQUIRE_CONFIG(quick_sprite); #include <QtQuick/QQuickItem> -#include <QTime> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickspritesequence_p_p.h b/src/quick/items/qquickspritesequence_p_p.h index 3579833116..4788cd15aa 100644 --- a/src/quick/items/qquickspritesequence_p_p.h +++ b/src/quick/items/qquickspritesequence_p_p.h @@ -57,6 +57,7 @@ QT_REQUIRE_CONFIG(quick_sprite); #include "qquickitem_p.h" #include "qquicksprite_p.h" +#include <QElapsedTimer> QT_BEGIN_NAMESPACE @@ -78,7 +79,7 @@ public: } QList<QQuickSprite*> m_sprites; QQuickSpriteEngine* m_spriteEngine; - QTime m_timestamp; + QElapsedTimer m_timestamp; int m_curFrame; bool m_pleaseReset; bool m_running; diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp index 1ac28c473b..255d679b1b 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp +++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp @@ -38,7 +38,6 @@ #include <QtTest/qtest.h> #include <QtTest/qtestsystem.h> #include <QtCore/qprocess.h> -#include <QtCore/qtimer.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> #include <QtCore/qmutex.h> @@ -162,8 +161,6 @@ private: void targetData(); bool waitForClientSignal(const char *signal, int timeout = 30000); void checkVersionParameters(); - - QTime t; }; @@ -171,7 +168,6 @@ private: void tst_QQmlDebugJS::initTestCase() { QQmlDebugTest::initTestCase(); - t.start(); } QQmlDebugTest::ConnectResult tst_QQmlDebugJS::init(bool qmlscene, const QString &qmlFile, diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index d64272d417..ff31f63ed5 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -29,7 +29,7 @@ #include <QtCore/qabstractanimation.h> #include <QtCore/qdir.h> #include <QtCore/qmath.h> -#include <QtCore/qdatetime.h> +#include <QtCore/qelapsedtimer.h> #include <QtCore/qpointer.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qtextstream.h> @@ -76,7 +76,7 @@ QVector<int> RenderStatistics::timesPerFrames; void RenderStatistics::updateStats() { - static QTime time; + static QElapsedTimer time; static int frames; static int lastTime; diff --git a/tools/qmltime/qmltime.cpp b/tools/qmltime/qmltime.cpp index b897d304fc..7baedff611 100644 --- a/tools/qmltime/qmltime.cpp +++ b/tools/qmltime/qmltime.cpp @@ -29,7 +29,7 @@ #include <QQmlComponent> #include <QDebug> #include <QGuiApplication> -#include <QTime> +#include <QElapsedTimer> #include <QQmlContext> #include <QQuickView> #include <QQuickItem> @@ -119,7 +119,7 @@ void Timer::setWillParent(bool p) void Timer::runTest(QQmlContext *context, uint iterations) { - QTime t; + QElapsedTimer t; t.start(); for (uint ii = 0; ii < iterations; ++ii) { QObject *o = m_component->create(context); |