diff --git a/src/libs/qmldebug/qmlprofilereventtypes.h b/src/libs/qmldebug/qmlprofilereventtypes.h index f1ed21bfaf5..a020ed2435b 100644 --- a/src/libs/qmldebug/qmlprofilereventtypes.h +++ b/src/libs/qmldebug/qmlprofilereventtypes.h @@ -38,6 +38,7 @@ enum QmlEventType { Creating, Binding, HandlingSignal, + Javascript, PixmapCacheEvent, SceneGraphFrameEvent, diff --git a/src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp index cdc672c8a60..9513d2cc460 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp @@ -69,7 +69,7 @@ QmlProfilerEventsModelProxy::QmlProfilerEventsModelProxy(QmlProfilerModelManager connect(modelManager->simpleModel(), SIGNAL(changed()), this, SLOT(dataChanged())); 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() @@ -274,7 +274,7 @@ QmlProfilerEventRelativesModelProxy::QmlProfilerEventRelativesModelProxy(QmlProf QTC_CHECK(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() diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index c74397abc0d..da0137b9c3b 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -622,6 +622,7 @@ QString QmlProfilerEventsMainView::nameForType(int typeNumber) case 2: return QmlProfilerEventsMainView::tr("Create"); case 3: return QmlProfilerEventsMainView::tr("Binding"); case 4: return QmlProfilerEventsMainView::tr("Signal"); + case 5: return QmlProfilerEventsMainView::tr("Javascript"); } return QString(); }