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

QmlProfiler: Show Javascript calls in events view.

Browse Source 
Change-Id: I11d22ce1423384f879e30ff9573f4d7d799535b1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-02-07 17:57:40 +01:00
parent 779ac6971c
commit 54eedf4e59
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/qmldebug/qmlprofilereventtypes.h
View File

@@ -38,6 +38,7 @@ enum QmlEventType {
Creating, Creating,
Binding, Binding,
HandlingSignal, HandlingSignal,
Javascript,
PixmapCacheEvent, PixmapCacheEvent,
SceneGraphFrameEvent, SceneGraphFrameEvent,

4
src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp
View File

@@ -69,7 +69,7 @@ QmlProfilerEventsModelProxy::QmlProfilerEventsModelProxy(QmlProfilerModelManager
connect(modelManager->simpleModel(), SIGNAL(changed()), this, SLOT(dataChanged())); connect(modelManager->simpleModel(), SIGNAL(changed()), this, SLOT(dataChanged()));
d->modelId = modelManager->registerModelProxy(); d->modelId = modelManager->registerModelProxy();
d->acceptedTypes << QmlDebug::Compiling << QmlDebug::Creating << QmlDebug::Binding << QmlDebug::HandlingSignal; d->acceptedTypes << QmlDebug::Compiling << QmlDebug::Creating << QmlDebug::Binding << QmlDebug::HandlingSignal << QmlDebug::Javascript;
} }
QmlProfilerEventsModelProxy::~QmlProfilerEventsModelProxy() QmlProfilerEventsModelProxy::~QmlProfilerEventsModelProxy()
@@ -274,7 +274,7 @@ QmlProfilerEventRelativesModelProxy::QmlProfilerEventRelativesModelProxy(QmlProf
QTC_CHECK(eventsModel); QTC_CHECK(eventsModel);
m_eventsModel = eventsModel; m_eventsModel = eventsModel;
m_acceptedTypes << QmlDebug::Compiling << QmlDebug::Creating << QmlDebug::Binding << QmlDebug::HandlingSignal; m_acceptedTypes << QmlDebug::Compiling << QmlDebug::Creating << QmlDebug::Binding << QmlDebug::HandlingSignal << QmlDebug::Javascript;
} }
QmlProfilerEventRelativesModelProxy::~QmlProfilerEventRelativesModelProxy() QmlProfilerEventRelativesModelProxy::~QmlProfilerEventRelativesModelProxy()

1
src/plugins/qmlprofiler/qmlprofilereventview.cpp
View File

@@ -622,6 +622,7 @@ QString QmlProfilerEventsMainView::nameForType(int typeNumber)
case 2: return QmlProfilerEventsMainView::tr("Create"); case 2: return QmlProfilerEventsMainView::tr("Create");
case 3: return QmlProfilerEventsMainView::tr("Binding"); case 3: return QmlProfilerEventsMainView::tr("Binding");
case 4: return QmlProfilerEventsMainView::tr("Signal"); case 4: return QmlProfilerEventsMainView::tr("Signal");
case 5: return QmlProfilerEventsMainView::tr("Javascript");
} }
return QString(); return QString();
} }