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

18
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -32,6 +32,13 @@
#include "qmlprofilerrangemodel.h"
#include "qmlprofilerplugin.h"
#include "inputeventsmodel.h"
#include "pixmapcachemodel.h"
#include "debugmessagesmodel.h"
#include "flamegraphview.h"
#include "memoryusagemodel.h"
#include "scenegraphtimelinemodel.h"
// Communication with the other views (limit events to range)
#include "qmlprofilerviewmanager.h"
@@ -119,12 +126,11 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
d->m_modelProxy = new Timeline::TimelineModelAggregator(modelManager->notesModel(), this);
d->m_modelManager = modelManager;
// external models pushed on top
foreach (QmlProfilerTimelineModel *timelineModel,
QmlProfilerPlugin::instance->getModels(modelManager)) {
d->m_modelProxy->addModel(timelineModel);
}
d->m_modelProxy->addModel(new PixmapCacheModel(modelManager, d->m_modelProxy));
d->m_modelProxy->addModel(new SceneGraphTimelineModel(modelManager, d->m_modelProxy));
d->m_modelProxy->addModel(new MemoryUsageModel(modelManager, d->m_modelProxy));
d->m_modelProxy->addModel(new InputEventsModel(modelManager, d->m_modelProxy));
d->m_modelProxy->addModel(new DebugMessagesModel(modelManager, d->m_modelProxy));
d->m_modelProxy->addModel(new QmlProfilerAnimationsModel(modelManager, d->m_modelProxy));
for (int i = 0; i < MaximumRangeType; ++i)