5 files changed, 12 insertions, 17 deletions
diff --git a/src/plugins/qmlprofiler/qml/Overview.js b/src/plugins/qmlprofiler/qml/Overview.js
index 4369baf057..cad1f6dbab 100644
--- a/src/plugins/qmlprofiler/qml/Overview.js
+++ b/src/plugins/qmlprofiler/qml/Overview.js
@@ -41,7 +41,7 @@ function drawGraph(canvas, ctxt)
 //draw the actual data to be graphed
 function drawData(canvas, ctxt)
 {
-    if ((!qmlProfilerModelProxy) || qmlProfilerModelProxy.count() === 0)
+    if ((!qmlProfilerModelProxy) || qmlProfilerModelProxy.isEmpty())
         return;
 
     var spacing = canvas.width / qmlProfilerModelProxy.traceDuration();
diff --git a/src/plugins/qmlprofiler/qml/Overview.qml b/src/plugins/qmlprofiler/qml/Overview.qml
index 99485648fd..a6100082fa 100644
--- a/src/plugins/qmlprofiler/qml/Overview.qml
+++ b/src/plugins/qmlprofiler/qml/Overview.qml
@@ -99,7 +99,10 @@ Canvas {
         target: qmlProfilerModelProxy
         onDataAvailable: {
             dataReady = true;
-            increment = Math.ceil(qmlProfilerModelProxy.count() / eventsPerPass);
+            increment = 0;
+            for (var i = 0; i < qmlProfilerModelProxy.modelCount(); ++i)
+                increment += qmlProfilerModelProxy.count(i);
+            increment = Math.ceil(increment / eventsPerPass);
             offset = -1;
             requestPaint();
         }
diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
index 7184558e37..48d1f2a4f4 100644
--- a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
+++ b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
@@ -122,15 +122,7 @@ QVariantList TimelineModelAggregator::models() const
 
 int TimelineModelAggregator::count(int modelIndex) const
 {
-    if (modelIndex == -1) {
-        int totalCount = 0;
-        foreach (const AbstractTimelineModel *modelProxy, d->modelList)
-            totalCount += modelProxy->count();
-
-        return totalCount;
-    } else {
-        return d->modelList[modelIndex]->count();
-    }
+    return d->modelList[modelIndex]->count();
 }
 
 bool TimelineModelAggregator::isEmpty() const
diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.h b/src/plugins/qmlprofiler/timelinemodelaggregator.h
index 8c99e02117..eb1e3037b3 100644
--- a/src/plugins/qmlprofiler/timelinemodelaggregator.h
+++ b/src/plugins/qmlprofiler/timelinemodelaggregator.h
@@ -51,7 +51,7 @@ public:
     const AbstractTimelineModel *model(int modelIndex) const;
     QVariantList models() const;
 
-    Q_INVOKABLE int count(int modelIndex = -1) const;
+    Q_INVOKABLE int count(int modelIndex) const;
     void clear();
     Q_INVOKABLE int modelCount() const;
 
@@ -59,7 +59,7 @@ public:
     Q_INVOKABLE qint64 traceEndTime() const;
     Q_INVOKABLE qint64 traceDuration() const;
 
-    bool isEmpty() const;
+    Q_INVOKABLE bool isEmpty() const;
 
     Q_INVOKABLE int rowHeight(int modelIndex, int row) const;
     Q_INVOKABLE void setRowHeight(int modelIndex, int row, int height);
diff --git a/src/plugins/qmlprofiler/timelinerenderer.cpp b/src/plugins/qmlprofiler/timelinerenderer.cpp
index 497228b76d..bc35f2aa07 100644
--- a/src/plugins/qmlprofiler/timelinerenderer.cpp
+++ b/src/plugins/qmlprofiler/timelinerenderer.cpp
@@ -408,7 +408,7 @@ void TimelineRenderer::manageHovered(int mouseX, int mouseY)
     int eventFrom = m_profilerModelProxy->firstIndex(modelIndex, startTime);
     int eventTo = m_profilerModelProxy->lastIndex(modelIndex, endTime);
     if (eventFrom == -1 ||
-            eventTo < eventFrom || eventTo >= m_profilerModelProxy->count()) {
+            eventTo < eventFrom || eventTo >= m_profilerModelProxy->count(modelIndex)) {
         m_currentSelection.eventIndex = -1;
         return;
     }
@@ -464,7 +464,7 @@ void TimelineRenderer::clearData()
 int TimelineRenderer::getYPosition(int modelIndex, int index) const
 {
     Q_ASSERT(m_profilerModelProxy);
-    if (index >= m_profilerModelProxy->count())
+    if (index >= m_profilerModelProxy->count(modelIndex))
         return 0;
 
     int modelRowStart = 0;
@@ -477,7 +477,7 @@ int TimelineRenderer::getYPosition(int modelIndex, int index) const
 
 void TimelineRenderer::selectNext()
 {
-    if (m_profilerModelProxy->count() == 0)
+    if (m_profilerModelProxy->isEmpty())
         return;
 
     qint64 searchTime = m_startTime;
@@ -533,7 +533,7 @@ void TimelineRenderer::selectNext()
 
 void TimelineRenderer::selectPrev()
 {
-    if (m_profilerModelProxy->count() == 0)
+    if (m_profilerModelProxy->isEmpty())
         return;
 
     qint64 searchTime = m_endTime;