diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2021-06-07 02:08:22 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2021-06-08 06:46:28 +0000 |
| commit | b730aa640554d3eb245a335bdb1b08bb8c4a2bef (patch) | |
| tree | fd0aecd5226d51933843499f72f4733ac92a5bdb /src/plugins/perfprofiler | |
| parent | a3391e7b33a3e7f67e409d065f393333ff726541 (diff) | |
Tracing/QmlProfiler/Perfprofiler: Merge modules
Move Tracing Qml Types into the "QtCreator.Tracing" module.
Move QmlProfiler Qml Types into the "QtCreator.QmlProfiler" module.
Move PerfProfiler Qml Types into the "QtCreator.PerfProfiler" module.
And tst_flamegraphview ones into QtCreator.TstTracingFlameGraphView.
... in preparation to register the types declaratively.
Change-Id: Ic0e3863d09b3426fa5b7419116625ad49b817dcf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/perfprofiler')
| -rw-r--r-- | src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml | 2 | ||||
| -rw-r--r-- | src/plugins/perfprofiler/perfprofilerflamegraphview.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/perfprofiler/perfprofilertraceview.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml b/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml index 58677b311a0..b508547407c 100644 --- a/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml +++ b/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import PerfProfilerFlameGraphModel 1.0 +import QtCreator.PerfProfiler 1.0 import "../tracing/" FlameGraphView { diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp b/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp index 596e836b0f9..03d220fa997 100644 --- a/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp +++ b/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp @@ -45,9 +45,9 @@ PerfProfilerFlameGraphView::PerfProfilerFlameGraphView(QWidget *parent, PerfProf PerfProfilerTraceManager *manager = tool->traceManager(); m_model = new PerfProfilerFlameGraphModel(manager); - qmlRegisterType<FlameGraph::FlameGraph>("FlameGraph", 1, 0, "FlameGraph"); + qmlRegisterType<FlameGraph::FlameGraph>("QtCreator.Tracing", 1, 0, "FlameGraph"); qmlRegisterUncreatableType<PerfProfilerFlameGraphModel>( - "PerfProfilerFlameGraphModel", 1, 0, "PerfProfilerFlameGraphModel", + "QtCreator.PerfProfiler", 1, 0, "PerfProfilerFlameGraphModel", QLatin1String("use the context property")); Timeline::TimelineTheme::setupTheme(engine()); diff --git a/src/plugins/perfprofiler/perfprofilertraceview.cpp b/src/plugins/perfprofiler/perfprofilertraceview.cpp index 69ac8736863..6a84cc55d75 100644 --- a/src/plugins/perfprofiler/perfprofilertraceview.cpp +++ b/src/plugins/perfprofiler/perfprofilertraceview.cpp @@ -42,12 +42,12 @@ PerfProfilerTraceView::PerfProfilerTraceView(QWidget *parent, PerfProfilerTool * { setObjectName(QLatin1String("PerfProfilerTraceView")); - qmlRegisterType<Timeline::TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer"); - qmlRegisterType<Timeline::TimelineOverviewRenderer>("TimelineOverviewRenderer", 1, 0, + qmlRegisterType<Timeline::TimelineRenderer>("QtCreator.Tracing", 1, 0, "TimelineRenderer"); + qmlRegisterType<Timeline::TimelineOverviewRenderer>("QtCreator.Tracing", 1, 0, "TimelineOverviewRenderer"); - qmlRegisterType<Timeline::TimelineZoomControl>(); - qmlRegisterType<Timeline::TimelineModel>(); - qmlRegisterType<Timeline::TimelineNotesModel>(); + qmlRegisterAnonymousType<Timeline::TimelineZoomControl>("QtCreator.Tracing", 1); + qmlRegisterAnonymousType<Timeline::TimelineModel>("QtCreator.Tracing", 1); + qmlRegisterAnonymousType<Timeline::TimelineNotesModel>("QtCreator.Tracing", 1); setResizeMode(QQuickWidget::SizeRootObjectToView); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |