Merge remote-tracking branch 'origin/4.9'

Change-Id: I95c56cc9371959f96afde3677fc82481f36f66c8

1 files changed, 9 insertions, 7 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp
index 4bbf8d2c440..d11c97e0854 100644
--- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp
@@ -298,13 +298,15 @@ void QmlProfilerStatisticsMainView::displayTypeIndex(int typeIndex)
         QAbstractItemModel *sourceModel = sortModel->sourceModel();
         QTC_ASSERT(sourceModel, return);
 
-        QModelIndex sourceIndex = sourceModel->index(qMin(typeIndex, sourceModel->rowCount() - 1),
-                                                     MainCallCount);
-        QTC_ASSERT(sourceIndex.data(TypeIdRole).toInt() == typeIndex, return);
-
-        setCurrentIndex(sourceIndex.data(SortRole).toInt() > 0
-                        ? sortModel->mapFromSource(sourceIndex)
-                        : QModelIndex());
+        if (typeIndex < sourceModel->rowCount()) {
+            QModelIndex sourceIndex = sourceModel->index(typeIndex, MainCallCount);
+            QTC_ASSERT(sourceIndex.data(TypeIdRole).toInt() == typeIndex, return);
+            setCurrentIndex(sourceIndex.data(SortRole).toInt() > 0
+                            ? sortModel->mapFromSource(sourceIndex)
+                            : QModelIndex());
+        } else {
+            setCurrentIndex(QModelIndex());
+        }
     }
 
     // show in callers/callees subwindow