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

Tracing/QmlProfiler/Perfprofiler: Merge modules

Browse Source 
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>
This commit is contained in:
Alessandro Portale
2021-06-07 02:08:22 +02:00
parent a3391e7b33
commit b730aa6405
29 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/tracing/qml/ButtonsBar.qml
View File

@@ -27,7 +27,7 @@ import QtQuick 2.1
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
ToolBar { ToolBar {
id: buttons id: buttons

2
src/libs/tracing/qml/CategoryLabel.qml
View File

@@ -26,7 +26,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Item { Item {
id: labelContainer id: labelContainer

2
src/libs/tracing/qml/FlameGraphDelegate.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0
import FlameGraph 1.0 import QtCreator.Tracing 1.0
Item { Item {
id: flamegraphItem id: flamegraphItem

3
src/libs/tracing/qml/FlameGraphView.qml
View File

@@ -23,8 +23,7 @@
** **
****************************************************************************/ ****************************************************************************/
import FlameGraph 1.0 import QtCreator.Tracing 1.0
import TimelineTheme 1.0
import QtQml 2.2 import QtQml 2.2
import QtQuick 2.9 import QtQuick 2.9

2
src/libs/tracing/qml/ImageToolButton.qml
View File

@@ -26,7 +26,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
ToolButton { ToolButton {
implicitWidth: 30 implicitWidth: 30

2
src/libs/tracing/qml/MainView.qml
View File

@@ -26,7 +26,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Rectangle { Rectangle {
id: root id: root

3
src/libs/tracing/qml/Overview.qml
View File

@@ -24,8 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.1 import QtQuick 2.1
import TimelineOverviewRenderer 1.0 import QtCreator.Tracing 1.0
import TimelineTheme 1.0
Rectangle { Rectangle {
id: overview id: overview

2
src/libs/tracing/qml/RangeDetails.qml
View File

@@ -26,7 +26,7 @@
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Item { Item {
id: rangeDetails id: rangeDetails

2
src/libs/tracing/qml/RangeMover.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.1 import QtQuick 2.1
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Item { Item {
id: rangeMover id: rangeMover

2
src/libs/tracing/qml/RowLabel.qml
View File

@@ -25,7 +25,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Button { Button {
id: button id: button

3
src/libs/tracing/qml/SelectionRangeDetails.qml
View File

@@ -26,8 +26,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
import TimelineTimeFormatter 1.0
Item { Item {
id: selectionRangeDetails id: selectionRangeDetails

3
src/libs/tracing/qml/TimeDisplay.qml
View File

@@ -24,8 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.1 import QtQuick 2.1
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
import TimelineTimeFormatter 1.0
Item { Item {
id: timeDisplay id: timeDisplay

2
src/libs/tracing/qml/TimeMarks.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.1 import QtQuick 2.1
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Item { Item {
id: timeMarks id: timeMarks

2
src/libs/tracing/qml/TimelineContent.qml
View File

@@ -25,7 +25,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import TimelineRenderer 1.0 import QtCreator.Tracing 1.0
import QtQml.Models 2.1 import QtQml.Models 2.1
Flickable { Flickable {

2
src/libs/tracing/qml/TimelineLabels.qml
View File

@@ -25,7 +25,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQml.Models 2.1 import QtQml.Models 2.1
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Flickable { Flickable {
id: categories id: categories

2
src/libs/tracing/qml/TimelineRulers.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Item { Item {
id: rulersParent id: rulersParent

2
src/libs/tracing/qml/TimelineText.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.0 import QtQuick 2.0
import TimelineTheme 1.0 import QtCreator.Tracing 1.0
Text { Text {
font.pixelSize: 12 font.pixelSize: 12

2
src/libs/tracing/timelineformattime.cpp
View File

@@ -96,7 +96,7 @@ static QObject *createFormatter(QQmlEngine *engine, QJSEngine *scriptEngine)
void TimeFormatter::setupTimeFormatter() void TimeFormatter::setupTimeFormatter()
{ {
static const int typeIndex = qmlRegisterSingletonType<TimeFormatter>( static const int typeIndex = qmlRegisterSingletonType<TimeFormatter>(
"TimelineTimeFormatter", 1, 0, "TimeFormatter", createFormatter); "QtCreator.Tracing", 1, 0, "TimeFormatter", createFormatter);
Q_UNUSED(typeIndex) Q_UNUSED(typeIndex)
} }

2
src/libs/tracing/timelinetheme.cpp
View File

@@ -112,7 +112,7 @@ static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
void TimelineTheme::setupTheme(QQmlEngine *engine) void TimelineTheme::setupTheme(QQmlEngine *engine)
{ {
static const int typeIndex = qmlRegisterSingletonType<Utils::Theme>("TimelineTheme", 1, 0, static const int typeIndex = qmlRegisterSingletonType<Utils::Theme>("QtCreator.Tracing", 1, 0,
"Theme", singletonProvider); "Theme", singletonProvider);
Q_UNUSED(typeIndex) Q_UNUSED(typeIndex)
engine->addImageProvider(QLatin1String("icons"), new TimelineImageIconProvider); engine->addImageProvider(QLatin1String("icons"), new TimelineImageIconProvider);

10
src/plugins/ctfvisualizer/ctfvisualizertraceview.cpp
View File

@@ -44,12 +44,12 @@ CtfVisualizerTraceView::CtfVisualizerTraceView(QWidget *parent, CtfVisualizerToo
{ {
setObjectName(QLatin1String("CtfVisualizerTraceView")); setObjectName(QLatin1String("CtfVisualizerTraceView"));
qmlRegisterType<Timeline::TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer"); qmlRegisterType<Timeline::TimelineRenderer>("QtCreator.Tracing", 1, 0, "TimelineRenderer");
qmlRegisterType<Timeline::TimelineOverviewRenderer>("TimelineOverviewRenderer", 1, 0, qmlRegisterType<Timeline::TimelineOverviewRenderer>("QtCreator.Tracing", 1, 0,
"TimelineOverviewRenderer"); "TimelineOverviewRenderer");
qmlRegisterType<Timeline::TimelineZoomControl>(); qmlRegisterAnonymousType<Timeline::TimelineZoomControl>("QtCreator.Tracing", 1);
qmlRegisterType<Timeline::TimelineModel>(); qmlRegisterAnonymousType<Timeline::TimelineModel>("QtCreator.Tracing", 1);
qmlRegisterType<Timeline::TimelineNotesModel>(); qmlRegisterAnonymousType<Timeline::TimelineNotesModel>("QtCreator.Tracing", 1);
setResizeMode(QQuickWidget::SizeRootObjectToView); setResizeMode(QQuickWidget::SizeRootObjectToView);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

2
src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml
View File

@@ -23,7 +23,7 @@
** **
****************************************************************************/ ****************************************************************************/
import PerfProfilerFlameGraphModel 1.0 import QtCreator.PerfProfiler 1.0
import "../tracing/" import "../tracing/"
FlameGraphView { FlameGraphView {

4
src/plugins/perfprofiler/perfprofilerflamegraphview.cpp
View File

@@ -45,9 +45,9 @@ PerfProfilerFlameGraphView::PerfProfilerFlameGraphView(QWidget *parent, PerfProf
PerfProfilerTraceManager *manager = tool->traceManager(); PerfProfilerTraceManager *manager = tool->traceManager();
m_model = new PerfProfilerFlameGraphModel(manager); m_model = new PerfProfilerFlameGraphModel(manager);
qmlRegisterType<FlameGraph::FlameGraph>("FlameGraph", 1, 0, "FlameGraph"); qmlRegisterType<FlameGraph::FlameGraph>("QtCreator.Tracing", 1, 0, "FlameGraph");
qmlRegisterUncreatableType<PerfProfilerFlameGraphModel>( qmlRegisterUncreatableType<PerfProfilerFlameGraphModel>(
"PerfProfilerFlameGraphModel", 1, 0, "PerfProfilerFlameGraphModel", "QtCreator.PerfProfiler", 1, 0, "PerfProfilerFlameGraphModel",
QLatin1String("use the context property")); QLatin1String("use the context property"));
Timeline::TimelineTheme::setupTheme(engine()); Timeline::TimelineTheme::setupTheme(engine());

10
src/plugins/perfprofiler/perfprofilertraceview.cpp
View File

@@ -42,12 +42,12 @@ PerfProfilerTraceView::PerfProfilerTraceView(QWidget *parent, PerfProfilerTool *
{ {
setObjectName(QLatin1String("PerfProfilerTraceView")); setObjectName(QLatin1String("PerfProfilerTraceView"));
qmlRegisterType<Timeline::TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer"); qmlRegisterType<Timeline::TimelineRenderer>("QtCreator.Tracing", 1, 0, "TimelineRenderer");
qmlRegisterType<Timeline::TimelineOverviewRenderer>("TimelineOverviewRenderer", 1, 0, qmlRegisterType<Timeline::TimelineOverviewRenderer>("QtCreator.Tracing", 1, 0,
"TimelineOverviewRenderer"); "TimelineOverviewRenderer");
qmlRegisterType<Timeline::TimelineZoomControl>(); qmlRegisterAnonymousType<Timeline::TimelineZoomControl>("QtCreator.Tracing", 1);
qmlRegisterType<Timeline::TimelineModel>(); qmlRegisterAnonymousType<Timeline::TimelineModel>("QtCreator.Tracing", 1);
qmlRegisterType<Timeline::TimelineNotesModel>(); qmlRegisterAnonymousType<Timeline::TimelineNotesModel>("QtCreator.Tracing", 1);
setResizeMode(QQuickWidget::SizeRootObjectToView); setResizeMode(QQuickWidget::SizeRootObjectToView);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

6
src/plugins/qmlprofiler/flamegraphview.cpp
View File

@@ -46,12 +46,10 @@ FlameGraphView::FlameGraphView(QmlProfilerModelManager *manager, QWidget *parent
setObjectName("QmlProfiler.FlameGraph.Dock"); setObjectName("QmlProfiler.FlameGraph.Dock");
setWindowTitle(tr("Flame Graph")); setWindowTitle(tr("Flame Graph"));
qmlRegisterType<FlameGraph::FlameGraph>("FlameGraph", 1, 0, "FlameGraph"); qmlRegisterType<FlameGraph::FlameGraph>("QtCreator.Tracing", 1, 0, "FlameGraph");
qmlRegisterUncreatableType<FlameGraphModel>("QmlProfilerFlameGraphModel", 1, 0, qmlRegisterUncreatableType<FlameGraphModel>("QtCreator.QmlProfiler", 1, 0,
"QmlProfilerFlameGraphModel", "QmlProfilerFlameGraphModel",
QLatin1String("use the context property")); QLatin1String("use the context property"));
qmlRegisterUncreatableType<QAbstractItemModel>("AbstractItemModel", 1, 0, "AbstractItemModel",
QLatin1String("only for Qt 5.4"));
Timeline::TimelineTheme::setupTheme(m_content->engine()); Timeline::TimelineTheme::setupTheme(m_content->engine());

2
src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml
View File

@@ -23,7 +23,7 @@
** **
****************************************************************************/ ****************************************************************************/
import QmlProfilerFlameGraphModel 1.0 import QtCreator.QmlProfiler 1.0
import "../tracing/" import "../tracing/"
FlameGraphView { FlameGraphView {

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

@@ -122,12 +122,12 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
groupLayout->setContentsMargins(0, 0, 0, 0); groupLayout->setContentsMargins(0, 0, 0, 0);
groupLayout->setSpacing(0); groupLayout->setSpacing(0);
qmlRegisterType<Timeline::TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer"); qmlRegisterType<Timeline::TimelineRenderer>("QtCreator.Tracing", 1, 0, "TimelineRenderer");
qmlRegisterType<Timeline::TimelineOverviewRenderer>("TimelineOverviewRenderer", 1, 0, qmlRegisterType<Timeline::TimelineOverviewRenderer>("QtCreator.Tracing", 1, 0,
"TimelineOverviewRenderer"); "TimelineOverviewRenderer");
qmlRegisterType<Timeline::TimelineZoomControl>(); qmlRegisterAnonymousType<Timeline::TimelineZoomControl>("QtCreator.Tracing", 1);
qmlRegisterType<Timeline::TimelineModel>(); qmlRegisterAnonymousType<Timeline::TimelineModel>("QtCreator.Tracing", 1);
qmlRegisterType<Timeline::TimelineNotesModel>(); qmlRegisterAnonymousType<Timeline::TimelineNotesModel>("QtCreator.Tracing", 1);
d->m_mainView = new QQuickWidget(this); d->m_mainView = new QQuickWidget(this);
d->m_mainView->setResizeMode(QQuickWidget::SizeRootObjectToView); d->m_mainView->setResizeMode(QQuickWidget::SizeRootObjectToView);

2
tests/auto/tracing/flamegraphview/TestFlameGraphView.qml
View File

@@ -23,7 +23,7 @@
** **
****************************************************************************/ ****************************************************************************/
import TestFlameGraphModel 1.0 import QtCreator.TstTracingFlameGraphView 1.0
import "../tracing/" import "../tracing/"
FlameGraphView { FlameGraphView {

4
tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp
View File

@@ -127,9 +127,9 @@ private:
void tst_FlameGraphView::initTestCase() void tst_FlameGraphView::initTestCase()
{ {
model.fill(); model.fill();
qmlRegisterType<FlameGraph::FlameGraph>("FlameGraph", 1, 0, "FlameGraph"); qmlRegisterType<FlameGraph::FlameGraph>("QtCreator.Tracing", 1, 0, "FlameGraph");
qmlRegisterUncreatableType<TestFlameGraphModel>( qmlRegisterUncreatableType<TestFlameGraphModel>(
"TestFlameGraphModel", 1, 0, "TestFlameGraphModel", "QtCreator.TstTracingFlameGraphView", 1, 0, "TestFlameGraphModel",
QLatin1String("use the context property")); QLatin1String("use the context property"));

10
tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp
View File

@@ -125,12 +125,12 @@ public:
{ {
setResizeMode(QQuickView::SizeRootObjectToView); setResizeMode(QQuickView::SizeRootObjectToView);
qmlRegisterType<TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer"); qmlRegisterType<TimelineRenderer>("QtCreator.Tracing", 1, 0, "TimelineRenderer");
qmlRegisterType<TimelineOverviewRenderer>( qmlRegisterType<TimelineOverviewRenderer>(
"TimelineOverviewRenderer", 1, 0, "TimelineOverviewRenderer"); "QtCreator.Tracing", 1, 0, "TimelineOverviewRenderer");
qmlRegisterAnonymousType<TimelineZoomControl>("TimelineZoomControl", 1); qmlRegisterAnonymousType<TimelineZoomControl>("QtCreator.Tracing", 1);
qmlRegisterAnonymousType<TimelineModel>("TimelineModel", 1); qmlRegisterAnonymousType<TimelineModel>("QtCreator.Tracing", 1);
qmlRegisterAnonymousType<TimelineNotesModel>("TimelineNotesModel", 1); qmlRegisterAnonymousType<TimelineNotesModel>("QtCreator.Tracing", 1);
TimelineTheme::setupTheme(engine()); TimelineTheme::setupTheme(engine());
TimeFormatter::setupTimeFormatter(); TimeFormatter::setupTimeFormatter();