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

Merge QmlProfiler and QmlProfilerExtension plugins

Browse Source 
Change-Id: Iaa1de7afda664a7a0779f47d104f863a16a34976
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-04-26 10:21:00 +02:00
parent ac2005b4e8
commit 600e1cdcea
37 changed files with 133 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@
#include "qmlprofilerstatemanager.h"
#include "qmlprofilermodelmanager.h"
#include "qmlprofilerstatewidget.h"
#include "flamegraphview.h"
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
@@ -97,8 +98,7 @@ void QmlProfilerViewManager::createViews()
Perspective::SplitVertical});
d->eventsViews << new QmlProfilerStatisticsView(0, d->profilerModelManager);
if (d->eventsViewFactory)
d->eventsViews.append(d->eventsViewFactory->create(0, d->profilerModelManager));
d->eventsViews << new FlameGraphView(0, d->profilerModelManager);
foreach (QmlProfilerEventsView *view, d->eventsViews) {
connect(view, &QmlProfilerEventsView::typeSelected,