Merge remote-tracking branch 'origin/4.7'

Change-Id: I9d433fa6ce4f60a2acfbdb21da9f727cac8d7526
2018-05-14 09:52:58 +02:00
parent f6d1d5b41e 2278ebed1e
commit e7123b140e
22 changed files with 102 additions and 185 deletions
--- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
@@ -577,9 +577,8 @@ QVariant QmlProfilerStatisticsRelativesModel::dataForMainEntry(qint64 totalDurat
        case RelativeCallCount: return 1;
        case RelativeDetails: return tr("Main Program");
        }
-    default:
-        return QVariant();
    }
+    return QVariant();
 }

 QVariant QmlProfilerStatisticsRelativesModel::data(const QModelIndex &index, int role) const