diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index a99c1531cc3bf864175f22286c9724249e5dd4a6..918b52572c8e0937572efe9d8e6e94f6562177bc 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -181,6 +181,11 @@ void QmlProfilerEventsWidget::updateSelectedEvent(int eventId) const m_eventTree->selectEvent(eventId); } +void QmlProfilerEventsWidget::selectBySourceLocation(const QString &filename, int line) +{ + m_eventTree->selectEventByLocation(filename, line); +} + bool QmlProfilerEventsWidget::hasGlobalStats() const { return m_globalStatsEnabled; @@ -589,6 +594,18 @@ void QmlProfilerEventsMainView::selectEvent(int eventId) } } +void QmlProfilerEventsMainView::selectEventByLocation(const QString &filename, int line) +{ + for (int i=0; i<d->m_model->rowCount(); i++) { + QStandardItem *infoItem = d->m_model->item(i, 0); + if (currentIndex() != d->m_model->indexFromItem(infoItem) && infoItem->data(FilenameRole).toString() == filename && infoItem->data(LineRole).toInt() == line) { + setCurrentIndex(d->m_model->indexFromItem(infoItem)); + jumpToItem(currentIndex()); + return; + } + } +} + QModelIndex QmlProfilerEventsMainView::selectedItem() const { QModelIndexList sel = selectedIndexes(); diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.h b/src/plugins/qmlprofiler/qmlprofilereventview.h index 48f37f2d5d1c257c46dcc7c4a0ca94e636252731..93ae9479fb5bf73f6294c2a5b42e70a77f70e67a 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.h +++ b/src/plugins/qmlprofiler/qmlprofilereventview.h @@ -79,6 +79,7 @@ signals: public slots: void updateSelectedEvent(int eventId) const; + void selectBySourceLocation(const QString &filename, int line); protected: void contextMenuEvent(QContextMenuEvent *ev); @@ -149,6 +150,7 @@ public slots: void clear(); void jumpToItem(const QModelIndex &index); void selectEvent(int eventId); + void selectEventByLocation(const QString &filename, int line); void buildModel(); private: diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index b44651242ba822e0ceea60decfc0618436f27b2d..694049913b75ca5e57dca9aaba4fe79754ef681a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -388,6 +388,9 @@ QWidget *QmlProfilerTool::createWidgets() connect(d->m_v8profilerView, SIGNAL(gotoSourceLocation(QString,int)), this, SLOT(gotoSourceLocation(QString,int))); connect(d->m_v8profilerView, SIGNAL(contextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint))); + connect(d->m_v8profilerView, SIGNAL(gotoSourceLocation(QString,int)), d->m_eventsView, SLOT(selectBySourceLocation(QString,int))); + connect(d->m_eventsView, SIGNAL(gotoSourceLocation(QString,int)), d->m_v8profilerView, SLOT(selectBySourceLocation(QString,int))); + QDockWidget *eventsDock = AnalyzerManager::createDockWidget (this, tr("Events"), d->m_eventsView, Qt::BottomDockWidgetArea); QDockWidget *timelineDock = AnalyzerManager::createDockWidget