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

QmlProfiler: Show Javascript calls in timeline view

Browse Source 
Change-Id: I781b95bdd9d6bfa12ec8f40f4197119ba51e194a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-02-10 11:32:56 +01:00
parent 54eedf4e59
commit 8af54aa44c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
View File

@@ -128,7 +128,7 @@ bool BasicTimelineModel::eventAccepted(const QmlProfilerSimpleModel::QmlEventDat
if (event.eventType == QmlDebug::Painting) if (event.eventType == QmlDebug::Painting)
return (event.bindingType == QmlDebug::QPainterEvent); return (event.bindingType == QmlDebug::QPainterEvent);
return (event.eventType <= QmlDebug::HandlingSignal); return (event.eventType <= QmlDebug::Javascript);
} }
void BasicTimelineModel::loadData() void BasicTimelineModel::loadData()
@@ -265,7 +265,8 @@ void BasicTimelineModel::BasicTimelineModelPrivate::findBindingLoops()
static QVector<QmlDebug::QmlEventType> acceptedTypes = static QVector<QmlDebug::QmlEventType> acceptedTypes =
QVector<QmlDebug::QmlEventType>() << QmlDebug::Compiling << QmlDebug::Creating QVector<QmlDebug::QmlEventType>() << QmlDebug::Compiling << QmlDebug::Creating
<< QmlDebug::Binding << QmlDebug::HandlingSignal; << QmlDebug::Binding << QmlDebug::HandlingSignal
<< QmlDebug::Javascript;
if (!acceptedTypes.contains(data.eventType)) if (!acceptedTypes.contains(data.eventType))
continue; continue;
@@ -354,7 +355,7 @@ int BasicTimelineModel::categoryDepth(int categoryIndex) const
int BasicTimelineModel::categoryCount() const int BasicTimelineModel::categoryCount() const
{ {
return 5; return 6;
} }
const QString BasicTimelineModel::categoryLabel(int categoryIndex) const const QString BasicTimelineModel::categoryLabel(int categoryIndex) const
@@ -365,6 +366,7 @@ const QString BasicTimelineModel::categoryLabel(int categoryIndex) const
case 2: return QCoreApplication::translate("MainView", "Creating"); break; case 2: return QCoreApplication::translate("MainView", "Creating"); break;
case 3: return QCoreApplication::translate("MainView", "Binding"); break; case 3: return QCoreApplication::translate("MainView", "Binding"); break;
case 4: return QCoreApplication::translate("MainView", "Handling Signal"); break; case 4: return QCoreApplication::translate("MainView", "Handling Signal"); break;
case 5: return QCoreApplication::translate("MainView", "Javascript"); break;
default: return QString(); default: return QString();
} }
} }