feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
This commit is contained in:
Eike Ziller
2018-02-01 09:58:36 +01:00
parent 6b29198874 97631cfdb8
commit ecb9fae785
138 changed files with 1554 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp
View File

@@ -107,41 +107,39 @@ static void setViewDefaults(Utils::TreeView *view)
static QString displayHeader(Fields header)
{
static const char ctxt[] = "QmlProfiler::Internal::QmlProfilerEventsMainView";
switch (header) {
case Callee:
return QCoreApplication::translate(ctxt, "Callee");
return QmlProfilerStatisticsMainView::tr("Callee");
case CalleeDescription:
return QCoreApplication::translate(ctxt, "Callee Description");
return QmlProfilerStatisticsMainView::tr("Callee Description");
case Caller:
return QCoreApplication::translate(ctxt, "Caller");
return QmlProfilerStatisticsMainView::tr("Caller");
case CallerDescription:
return QCoreApplication::translate(ctxt, "Caller Description");
return QmlProfilerStatisticsMainView::tr("Caller Description");
case CallCount:
return QCoreApplication::translate(ctxt, "Calls");
return QmlProfilerStatisticsMainView::tr("Calls");
case Details:
return QCoreApplication::translate(ctxt, "Details");
return QmlProfilerStatisticsMainView::tr("Details");
case Location:
return QCoreApplication::translate(ctxt, "Location");
return QmlProfilerStatisticsMainView::tr("Location");
case MaxTime:
return QCoreApplication::translate(ctxt, "Longest Time");
return QmlProfilerStatisticsMainView::tr("Longest Time");
case TimePerCall:
return QCoreApplication::translate(ctxt, "Mean Time");
return QmlProfilerStatisticsMainView::tr("Mean Time");
case SelfTime:
return QCoreApplication::translate(ctxt, "Self Time");
return QmlProfilerStatisticsMainView::tr("Self Time");
case SelfTimeInPercent:
return QCoreApplication::translate(ctxt, "Self Time in Percent");
return QmlProfilerStatisticsMainView::tr("Self Time in Percent");
case MinTime:
return QCoreApplication::translate(ctxt, "Shortest Time");
return QmlProfilerStatisticsMainView::tr("Shortest Time");
case TimeInPercent:
return QCoreApplication::translate(ctxt, "Time in Percent");
return QmlProfilerStatisticsMainView::tr("Time in Percent");
case TotalTime:
return QCoreApplication::translate(ctxt, "Total Time");
return QmlProfilerStatisticsMainView::tr("Total Time");
case Type:
return QCoreApplication::translate(ctxt, "Type");
return QmlProfilerStatisticsMainView::tr("Type");
case MedianTime:
return QCoreApplication::translate(ctxt, "Median Time");
return QmlProfilerStatisticsMainView::tr("Median Time");
default:
return QString();
}