From b730aa640554d3eb245a335bdb1b08bb8c4a2bef Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 7 Jun 2021 02:08:22 +0200 Subject: [PATCH] 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 --- src/libs/tracing/qml/ButtonsBar.qml | 2 +- src/libs/tracing/qml/CategoryLabel.qml | 2 +- src/libs/tracing/qml/FlameGraphDelegate.qml | 2 +- src/libs/tracing/qml/FlameGraphView.qml | 3 +-- src/libs/tracing/qml/ImageToolButton.qml | 2 +- src/libs/tracing/qml/MainView.qml | 2 +- src/libs/tracing/qml/Overview.qml | 3 +-- src/libs/tracing/qml/RangeDetails.qml | 2 +- src/libs/tracing/qml/RangeMover.qml | 2 +- src/libs/tracing/qml/RowLabel.qml | 2 +- src/libs/tracing/qml/SelectionRangeDetails.qml | 3 +-- src/libs/tracing/qml/TimeDisplay.qml | 3 +-- src/libs/tracing/qml/TimeMarks.qml | 2 +- src/libs/tracing/qml/TimelineContent.qml | 2 +- src/libs/tracing/qml/TimelineLabels.qml | 2 +- src/libs/tracing/qml/TimelineRulers.qml | 2 +- src/libs/tracing/qml/TimelineText.qml | 2 +- src/libs/tracing/timelineformattime.cpp | 2 +- src/libs/tracing/timelinetheme.cpp | 2 +- src/plugins/ctfvisualizer/ctfvisualizertraceview.cpp | 10 +++++----- .../perfprofiler/PerfProfilerFlameGraphView.qml | 2 +- .../perfprofiler/perfprofilerflamegraphview.cpp | 4 ++-- src/plugins/perfprofiler/perfprofilertraceview.cpp | 10 +++++----- src/plugins/qmlprofiler/flamegraphview.cpp | 6 ++---- .../qmlprofiler/qml/QmlProfilerFlameGraphView.qml | 2 +- src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 10 +++++----- .../auto/tracing/flamegraphview/TestFlameGraphView.qml | 2 +- .../auto/tracing/flamegraphview/tst_flamegraphview.cpp | 4 ++-- .../widgets/tracing/tst_manual_widgets_tracing.cpp | 10 +++++----- 29 files changed, 48 insertions(+), 54 deletions(-) diff --git a/src/libs/tracing/qml/ButtonsBar.qml b/src/libs/tracing/qml/ButtonsBar.qml index 32111daa571..580d12a3a9d 100644 --- a/src/libs/tracing/qml/ButtonsBar.qml +++ b/src/libs/tracing/qml/ButtonsBar.qml @@ -27,7 +27,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 ToolBar { id: buttons diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml index c47e843f239..cfd98c9a31f 100644 --- a/src/libs/tracing/qml/CategoryLabel.qml +++ b/src/libs/tracing/qml/CategoryLabel.qml @@ -26,7 +26,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.2 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Item { id: labelContainer diff --git a/src/libs/tracing/qml/FlameGraphDelegate.qml b/src/libs/tracing/qml/FlameGraphDelegate.qml index 79441d0267b..09efdc53f65 100644 --- a/src/libs/tracing/qml/FlameGraphDelegate.qml +++ b/src/libs/tracing/qml/FlameGraphDelegate.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.0 -import FlameGraph 1.0 +import QtCreator.Tracing 1.0 Item { id: flamegraphItem diff --git a/src/libs/tracing/qml/FlameGraphView.qml b/src/libs/tracing/qml/FlameGraphView.qml index a27f3da8d6c..4752ae81d51 100644 --- a/src/libs/tracing/qml/FlameGraphView.qml +++ b/src/libs/tracing/qml/FlameGraphView.qml @@ -23,8 +23,7 @@ ** ****************************************************************************/ -import FlameGraph 1.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 import QtQml 2.2 import QtQuick 2.9 diff --git a/src/libs/tracing/qml/ImageToolButton.qml b/src/libs/tracing/qml/ImageToolButton.qml index 686fd2db88d..d2959d7ac1b 100644 --- a/src/libs/tracing/qml/ImageToolButton.qml +++ b/src/libs/tracing/qml/ImageToolButton.qml @@ -26,7 +26,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 ToolButton { implicitWidth: 30 diff --git a/src/libs/tracing/qml/MainView.qml b/src/libs/tracing/qml/MainView.qml index 4e28ea9b26c..0bdf9346ec7 100644 --- a/src/libs/tracing/qml/MainView.qml +++ b/src/libs/tracing/qml/MainView.qml @@ -26,7 +26,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Rectangle { id: root diff --git a/src/libs/tracing/qml/Overview.qml b/src/libs/tracing/qml/Overview.qml index f24bd03dae4..d2b3eb29417 100644 --- a/src/libs/tracing/qml/Overview.qml +++ b/src/libs/tracing/qml/Overview.qml @@ -24,8 +24,7 @@ ****************************************************************************/ import QtQuick 2.1 -import TimelineOverviewRenderer 1.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Rectangle { id: overview diff --git a/src/libs/tracing/qml/RangeDetails.qml b/src/libs/tracing/qml/RangeDetails.qml index cb99479ca49..c98d4d6d83b 100644 --- a/src/libs/tracing/qml/RangeDetails.qml +++ b/src/libs/tracing/qml/RangeDetails.qml @@ -26,7 +26,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Item { id: rangeDetails diff --git a/src/libs/tracing/qml/RangeMover.qml b/src/libs/tracing/qml/RangeMover.qml index 7a4e27e01f1..346d251b55e 100644 --- a/src/libs/tracing/qml/RangeMover.qml +++ b/src/libs/tracing/qml/RangeMover.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.1 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Item { id: rangeMover diff --git a/src/libs/tracing/qml/RowLabel.qml b/src/libs/tracing/qml/RowLabel.qml index e73d51b2916..5ea85693e59 100644 --- a/src/libs/tracing/qml/RowLabel.qml +++ b/src/libs/tracing/qml/RowLabel.qml @@ -25,7 +25,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.2 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Button { id: button diff --git a/src/libs/tracing/qml/SelectionRangeDetails.qml b/src/libs/tracing/qml/SelectionRangeDetails.qml index e5b9c411067..307bdd660f9 100644 --- a/src/libs/tracing/qml/SelectionRangeDetails.qml +++ b/src/libs/tracing/qml/SelectionRangeDetails.qml @@ -26,8 +26,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.0 -import TimelineTheme 1.0 -import TimelineTimeFormatter 1.0 +import QtCreator.Tracing 1.0 Item { id: selectionRangeDetails diff --git a/src/libs/tracing/qml/TimeDisplay.qml b/src/libs/tracing/qml/TimeDisplay.qml index 6bca32590f1..d4876597459 100644 --- a/src/libs/tracing/qml/TimeDisplay.qml +++ b/src/libs/tracing/qml/TimeDisplay.qml @@ -24,8 +24,7 @@ ****************************************************************************/ import QtQuick 2.1 -import TimelineTheme 1.0 -import TimelineTimeFormatter 1.0 +import QtCreator.Tracing 1.0 Item { id: timeDisplay diff --git a/src/libs/tracing/qml/TimeMarks.qml b/src/libs/tracing/qml/TimeMarks.qml index a0f93e6eadc..761a4a07fcc 100644 --- a/src/libs/tracing/qml/TimeMarks.qml +++ b/src/libs/tracing/qml/TimeMarks.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.1 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Item { id: timeMarks diff --git a/src/libs/tracing/qml/TimelineContent.qml b/src/libs/tracing/qml/TimelineContent.qml index 188ee28136a..f4579007a67 100644 --- a/src/libs/tracing/qml/TimelineContent.qml +++ b/src/libs/tracing/qml/TimelineContent.qml @@ -25,7 +25,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.2 -import TimelineRenderer 1.0 +import QtCreator.Tracing 1.0 import QtQml.Models 2.1 Flickable { diff --git a/src/libs/tracing/qml/TimelineLabels.qml b/src/libs/tracing/qml/TimelineLabels.qml index ac5fd2123de..c675ce1b6d9 100644 --- a/src/libs/tracing/qml/TimelineLabels.qml +++ b/src/libs/tracing/qml/TimelineLabels.qml @@ -25,7 +25,7 @@ import QtQuick 2.0 import QtQml.Models 2.1 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Flickable { id: categories diff --git a/src/libs/tracing/qml/TimelineRulers.qml b/src/libs/tracing/qml/TimelineRulers.qml index c095bd280e2..0e052e716ff 100644 --- a/src/libs/tracing/qml/TimelineRulers.qml +++ b/src/libs/tracing/qml/TimelineRulers.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Item { id: rulersParent diff --git a/src/libs/tracing/qml/TimelineText.qml b/src/libs/tracing/qml/TimelineText.qml index dc354875d55..8354b62f3cf 100644 --- a/src/libs/tracing/qml/TimelineText.qml +++ b/src/libs/tracing/qml/TimelineText.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.0 -import TimelineTheme 1.0 +import QtCreator.Tracing 1.0 Text { font.pixelSize: 12 diff --git a/src/libs/tracing/timelineformattime.cpp b/src/libs/tracing/timelineformattime.cpp index 314a68f236b..1bda33a0761 100644 --- a/src/libs/tracing/timelineformattime.cpp +++ b/src/libs/tracing/timelineformattime.cpp @@ -96,7 +96,7 @@ static QObject *createFormatter(QQmlEngine *engine, QJSEngine *scriptEngine) void TimeFormatter::setupTimeFormatter() { static const int typeIndex = qmlRegisterSingletonType( - "TimelineTimeFormatter", 1, 0, "TimeFormatter", createFormatter); + "QtCreator.Tracing", 1, 0, "TimeFormatter", createFormatter); Q_UNUSED(typeIndex) } diff --git a/src/libs/tracing/timelinetheme.cpp b/src/libs/tracing/timelinetheme.cpp index a8a7c874e1f..d274d3cec95 100644 --- a/src/libs/tracing/timelinetheme.cpp +++ b/src/libs/tracing/timelinetheme.cpp @@ -112,7 +112,7 @@ static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine) void TimelineTheme::setupTheme(QQmlEngine *engine) { - static const int typeIndex = qmlRegisterSingletonType("TimelineTheme", 1, 0, + static const int typeIndex = qmlRegisterSingletonType("QtCreator.Tracing", 1, 0, "Theme", singletonProvider); Q_UNUSED(typeIndex) engine->addImageProvider(QLatin1String("icons"), new TimelineImageIconProvider); diff --git a/src/plugins/ctfvisualizer/ctfvisualizertraceview.cpp b/src/plugins/ctfvisualizer/ctfvisualizertraceview.cpp index a89afe0df34..4d61c1d66fe 100644 --- a/src/plugins/ctfvisualizer/ctfvisualizertraceview.cpp +++ b/src/plugins/ctfvisualizer/ctfvisualizertraceview.cpp @@ -44,12 +44,12 @@ CtfVisualizerTraceView::CtfVisualizerTraceView(QWidget *parent, CtfVisualizerToo { setObjectName(QLatin1String("CtfVisualizerTraceView")); - qmlRegisterType("TimelineRenderer", 1, 0, "TimelineRenderer"); - qmlRegisterType("TimelineOverviewRenderer", 1, 0, + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineRenderer"); + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineOverviewRenderer"); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); setResizeMode(QQuickWidget::SizeRootObjectToView); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); 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", 1, 0, "FlameGraph"); + qmlRegisterType("QtCreator.Tracing", 1, 0, "FlameGraph"); qmlRegisterUncreatableType( - "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("TimelineRenderer", 1, 0, "TimelineRenderer"); - qmlRegisterType("TimelineOverviewRenderer", 1, 0, + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineRenderer"); + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineOverviewRenderer"); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); setResizeMode(QQuickWidget::SizeRootObjectToView); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/plugins/qmlprofiler/flamegraphview.cpp b/src/plugins/qmlprofiler/flamegraphview.cpp index 24403ab72b6..995d028504b 100644 --- a/src/plugins/qmlprofiler/flamegraphview.cpp +++ b/src/plugins/qmlprofiler/flamegraphview.cpp @@ -46,12 +46,10 @@ FlameGraphView::FlameGraphView(QmlProfilerModelManager *manager, QWidget *parent setObjectName("QmlProfiler.FlameGraph.Dock"); setWindowTitle(tr("Flame Graph")); - qmlRegisterType("FlameGraph", 1, 0, "FlameGraph"); - qmlRegisterUncreatableType("QmlProfilerFlameGraphModel", 1, 0, + qmlRegisterType("QtCreator.Tracing", 1, 0, "FlameGraph"); + qmlRegisterUncreatableType("QtCreator.QmlProfiler", 1, 0, "QmlProfilerFlameGraphModel", QLatin1String("use the context property")); - qmlRegisterUncreatableType("AbstractItemModel", 1, 0, "AbstractItemModel", - QLatin1String("only for Qt 5.4")); Timeline::TimelineTheme::setupTheme(m_content->engine()); diff --git a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml index 1780dee7f2b..5f60e563e32 100644 --- a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml +++ b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import QmlProfilerFlameGraphModel 1.0 +import QtCreator.QmlProfiler 1.0 import "../tracing/" FlameGraphView { diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 7f5bef35c21..ce3e7135a5a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -122,12 +122,12 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag groupLayout->setContentsMargins(0, 0, 0, 0); groupLayout->setSpacing(0); - qmlRegisterType("TimelineRenderer", 1, 0, "TimelineRenderer"); - qmlRegisterType("TimelineOverviewRenderer", 1, 0, + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineRenderer"); + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineOverviewRenderer"); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); d->m_mainView = new QQuickWidget(this); d->m_mainView->setResizeMode(QQuickWidget::SizeRootObjectToView); diff --git a/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml b/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml index 7324360b2a6..a449b9c6550 100644 --- a/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml +++ b/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import TestFlameGraphModel 1.0 +import QtCreator.TstTracingFlameGraphView 1.0 import "../tracing/" FlameGraphView { diff --git a/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp b/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp index bfec6028f89..e48c5f21605 100644 --- a/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp +++ b/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp @@ -127,9 +127,9 @@ private: void tst_FlameGraphView::initTestCase() { model.fill(); - qmlRegisterType("FlameGraph", 1, 0, "FlameGraph"); + qmlRegisterType("QtCreator.Tracing", 1, 0, "FlameGraph"); qmlRegisterUncreatableType( - "TestFlameGraphModel", 1, 0, "TestFlameGraphModel", + "QtCreator.TstTracingFlameGraphView", 1, 0, "TestFlameGraphModel", QLatin1String("use the context property")); diff --git a/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp b/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp index baa879dc3ae..e47bfc1be06 100644 --- a/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp +++ b/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp @@ -125,12 +125,12 @@ public: { setResizeMode(QQuickView::SizeRootObjectToView); - qmlRegisterType("TimelineRenderer", 1, 0, "TimelineRenderer"); + qmlRegisterType("QtCreator.Tracing", 1, 0, "TimelineRenderer"); qmlRegisterType( - "TimelineOverviewRenderer", 1, 0, "TimelineOverviewRenderer"); - qmlRegisterAnonymousType("TimelineZoomControl", 1); - qmlRegisterAnonymousType("TimelineModel", 1); - qmlRegisterAnonymousType("TimelineNotesModel", 1); + "QtCreator.Tracing", 1, 0, "TimelineOverviewRenderer"); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); + qmlRegisterAnonymousType("QtCreator.Tracing", 1); TimelineTheme::setupTheme(engine()); TimeFormatter::setupTimeFormatter();