2 files changed, 18 insertions, 18 deletions

diff --git a/tools/qmlprofiler/qmlprofilerclient.h b/tools/qmlprofiler/qmlprofilerclient.h
index 1da04db42a..a04a412bb0 100644
--- a/tools/qmlprofiler/qmlprofilerclient.h
+++ b/tools/qmlprofiler/qmlprofilerclient.h
@@ -50,24 +50,24 @@ signals:
     void error(const QString &error);
 
 private:
-    virtual void stateChanged(State state);
+    void stateChanged(State state) override;
 
-    void traceStarted(qint64 time, int engineId);
-    void traceFinished(qint64 time, int engineId);
-    void rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime);
-    void rangeData(QQmlProfilerDefinitions::RangeType type, qint64 time, const QString &data);
+    void traceStarted(qint64 time, int engineId) override;
+    void traceFinished(qint64 time, int engineId) override;
+    void rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime) override;
+    void rangeData(QQmlProfilerDefinitions::RangeType type, qint64 time, const QString &data) override;
     void rangeLocation(QQmlProfilerDefinitions::RangeType type, qint64 time,
-                       const QQmlEventLocation &location);
-    void rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime);
-    void animationFrame(qint64 time, int frameRate, int animationCount, int threadId);
+                       const QQmlEventLocation &location) override;
+    void rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime) override;
+    void animationFrame(qint64 time, int frameRate, int animationCount, int threadId) override;
     void sceneGraphEvent(QQmlProfilerDefinitions::SceneGraphFrameType type, qint64 time,
                          qint64 numericData1, qint64 numericData2, qint64 numericData3,
-                         qint64 numericData4, qint64 numericData5);
+                         qint64 numericData4, qint64 numericData5) override;
     void pixmapCacheEvent(QQmlProfilerDefinitions::PixmapEventType type, qint64 time,
-                          const QString &url, int numericData1, int numericData2);
-    void memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time, qint64 amount);
-    void inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time, int a, int b);
-    void complete();
+                          const QString &url, int numericData1, int numericData2) override;
+    void memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time, qint64 amount) override;
+    void inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time, int a, int b) override;
+    void complete() override;
 };
 
 #endif // QMLPROFILERCLIENT_H
diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index 048c92bb93..668cb3ce2d 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -403,23 +403,23 @@ void QmlProfilerData::computeQmlTime()
     int level = minimumLevel;
 
     for (int i = 0; i < d->startInstanceList.count(); i++) {
-        qint64 st = d->startInstanceList[i].startTime;
+        qint64 st = d->startInstanceList.at(i).startTime;
 
-        if (d->startInstanceList[i].data->rangeType == QQmlProfilerDefinitions::Painting) {
+        if (d->startInstanceList.at(i).data->rangeType == QQmlProfilerDefinitions::Painting) {
             continue;
         }
 
         // general level
-        if (endtimesPerLevel[level] > st) {
+        if (endtimesPerLevel.value(level) > st) {
             level++;
         } else {
             while (level > minimumLevel && endtimesPerLevel[level-1] <= st)
                 level--;
         }
-        endtimesPerLevel[level] = st + d->startInstanceList[i].duration;
+        endtimesPerLevel[level] = st + d->startInstanceList.at(i).duration;
 
         if (level == minimumLevel) {
-            d->qmlMeasuredTime += d->startInstanceList[i].duration;
+            d->qmlMeasuredTime += d->startInstanceList.at(i).duration;
         }
     }
 }