diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-04-28 15:40:02 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-06 10:36:40 +0000 |
commit | 215c0533d20950d412e304dc41bc0bc93afac84f (patch) | |
tree | d6ae94409a4d407b3d2bbb15097f8cd14c093fc3 /src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp | |
parent | a53780924de223f56c5294d5ab9f501a602585bc (diff) |
QmlProfiler: Rename QmlEvent::startTime to "timestamp"
As many events are instantaneous and we're going to drop the duration
property soon, this is more fitting.
Change-Id: I6e13dd076a5b9df16aed44bf9f631ea5760e9cbf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp index a0217af9a94..36b956a1458 100644 --- a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp @@ -84,10 +84,10 @@ void QmlProfilerAnimationsModel::loadData() qint64 estimatedDuration = event.numericData(0) > 0 ? 1e9/event.numericData(0) : 1; // the profiler registers the animation events at the end of them - qint64 realEndTime = event.startTime(); + qint64 realEndTime = event.timestamp(); // ranges should not overlap. If they do, our estimate wasn't accurate enough - qint64 realStartTime = qMax(event.startTime() - estimatedDuration, + qint64 realStartTime = qMax(event.timestamp() - estimatedDuration, minNextStartTimes[lastThread]); // Sometimes our estimate is far off or the server has miscalculated the frame rate @@ -109,7 +109,7 @@ void QmlProfilerAnimationsModel::loadData() m_maxRenderThreadAnimations = qMax(lastEvent.animationcount, m_maxRenderThreadAnimations); - minNextStartTimes[lastThread] = event.startTime() + 1; + minNextStartTimes[lastThread] = event.timestamp() + 1; updateProgress(count(), referenceList.count()); } |