diff options
Diffstat (limited to 'src/plugins/qmlprofiler')
28 files changed, 47 insertions, 45 deletions
diff --git a/src/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofiler/debugmessagesmodel.cpp index 792ae23b092..b5268691a81 100644 --- a/src/plugins/qmlprofiler/debugmessagesmodel.cpp +++ b/src/plugins/qmlprofiler/debugmessagesmodel.cpp @@ -25,7 +25,7 @@ #include "debugmessagesmodel.h" #include "qmlprofilerconstants.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> namespace QmlProfiler { namespace Internal { diff --git a/src/plugins/qmlprofiler/flamegraphview.cpp b/src/plugins/qmlprofiler/flamegraphview.cpp index d5b5bcca24e..815ffcb86de 100644 --- a/src/plugins/qmlprofiler/flamegraphview.cpp +++ b/src/plugins/qmlprofiler/flamegraphview.cpp @@ -27,8 +27,8 @@ #include "qmlprofilerconstants.h" #include "qmlprofilertool.h" -#include <flamegraph/flamegraph.h> -#include <timeline/timelinetheme.h> +#include <tracing/flamegraph.h> +#include <tracing/timelinetheme.h> #include <utils/theme/theme.h> #include <QQmlEngine> diff --git a/src/plugins/qmlprofiler/inputeventsmodel.cpp b/src/plugins/qmlprofiler/inputeventsmodel.cpp index 01268c56202..21ce9b41c2e 100644 --- a/src/plugins/qmlprofiler/inputeventsmodel.cpp +++ b/src/plugins/qmlprofiler/inputeventsmodel.cpp @@ -27,7 +27,7 @@ #include "qmlprofilermodelmanager.h" #include "qmlprofilereventtypes.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QKeyEvent> #include <QMouseEvent> diff --git a/src/plugins/qmlprofiler/pixmapcachemodel.cpp b/src/plugins/qmlprofiler/pixmapcachemodel.cpp index be7e7227c32..9fd77d7d6d5 100644 --- a/src/plugins/qmlprofiler/pixmapcachemodel.cpp +++ b/src/plugins/qmlprofiler/pixmapcachemodel.cpp @@ -27,7 +27,7 @@ #include "qmlprofilermodelmanager.h" #include "qmlprofilereventtypes.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> namespace QmlProfiler { namespace Internal { diff --git a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml index b898ced1694..eb6a43ab3f8 100644 --- a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml +++ b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml @@ -28,7 +28,7 @@ import QtQuick.Controls 1.3 import FlameGraph 1.0 import QmlProfilerFlameGraphModel 1.0 import TimelineTheme 1.0 -import "../flamegraph/" +import "../tracing/" ScrollView { id: root diff --git a/src/plugins/qmlprofiler/qmlevent.h b/src/plugins/qmlprofiler/qmlevent.h index cd8c99c005a..dd8515e0bcd 100644 --- a/src/plugins/qmlprofiler/qmlevent.h +++ b/src/plugins/qmlprofiler/qmlevent.h @@ -26,7 +26,7 @@ #include "qmlprofilereventtypes.h" -#include <timeline/traceevent.h> +#include <tracing/traceevent.h> #include <QString> #include <QByteArray> diff --git a/src/plugins/qmlprofiler/qmleventtype.h b/src/plugins/qmlprofiler/qmleventtype.h index 20934ec6eb8..6c3fc53e06d 100644 --- a/src/plugins/qmlprofiler/qmleventtype.h +++ b/src/plugins/qmlprofiler/qmleventtype.h @@ -27,7 +27,7 @@ #include "qmleventlocation.h" #include "qmlprofilereventtypes.h" -#include <timeline/traceeventtype.h> +#include <tracing/traceeventtype.h> #include <QString> #include <QMetaType> diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index 5a2f4b6ebb1..74a2c7f8517 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.qbs +++ b/src/plugins/qmlprofiler/qmlprofiler.qbs @@ -5,11 +5,10 @@ QtcPlugin { Depends { name: "Qt"; submodules: ["widgets", "network", "quick", "quickwidgets"] } - Depends { name: "FlameGraph" } Depends { name: "QmlJS" } Depends { name: "QmlDebug" } Depends { name: "Utils" } - Depends { name: "Timeline" } + Depends { name: "Tracing" } Depends { name: "Core" } Depends { name: "Debugger" } diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri index 850352458ac..f345d5ac61e 100644 --- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri +++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri @@ -1,10 +1,9 @@ QTC_PLUGIN_NAME = QmlProfiler QTC_LIB_DEPENDS += \ extensionsystem \ - flamegraph \ qmldebug \ qmljs \ - timeline \ + tracing \ utils QTC_PLUGIN_DEPENDS += \ diff --git a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp index d207ec96da0..7e7f46ed43c 100644 --- a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp @@ -27,7 +27,7 @@ #include "qmlprofilermodelmanager.h" #include <utils/qtcassert.h> -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QCoreApplication> #include <QVector> diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h index 6f578057e29..ef6695d9bc2 100644 --- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h +++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h @@ -27,9 +27,9 @@ #include "qmlprofilerrangemodel.h" -#include "timeline/timelineabstractrenderer.h" -#include "timeline/timelinerenderpass.h" -#include "timeline/timelinerenderstate.h" +#include <tracing/timelineabstractrenderer.h> +#include <tracing/timelinerenderpass.h> +#include <tracing/timelinerenderstate.h> #include <QSGMaterial> diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 01aed56aa2d..78f2b0fb049 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -30,7 +30,7 @@ #include "qmlprofilerdetailsrewriter.h" #include <coreplugin/progressmanager/progressmanager.h> -#include <timeline/tracestashfile.h> +#include <tracing/tracestashfile.h> #include <utils/runextensions.h> #include <utils/qtcassert.h> diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h index c0bac3acf51..f3bef6869b7 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h @@ -33,7 +33,7 @@ #include "qmlprofilertextmark.h" #include <utils/fileinprojectfinder.h> -#include <timeline/timelinetracemanager.h> +#include <tracing/timelinetracemanager.h> #include <QObject> #include <functional> diff --git a/src/plugins/qmlprofiler/qmlprofilernotesmodel.h b/src/plugins/qmlprofiler/qmlprofilernotesmodel.h index 3c11260e30a..c6b43185c17 100644 --- a/src/plugins/qmlprofiler/qmlprofilernotesmodel.h +++ b/src/plugins/qmlprofiler/qmlprofilernotesmodel.h @@ -27,7 +27,9 @@ #include "qmlprofilermodelmanager.h" #include "qmlnote.h" -#include "timeline/timelinenotesmodel.h" + +#include <tracing/timelinenotesmodel.h> + #include <QList> #include <QHash> diff --git a/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp b/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp index cfa992b6e0e..498b8dd4d66 100644 --- a/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp @@ -27,10 +27,10 @@ #include "qmlprofilermodelmanager.h" #include "qmlprofilerbindingloopsrenderpass.h" -#include "timeline/timelinenotesrenderpass.h" -#include "timeline/timelineitemsrenderpass.h" -#include "timeline/timelineselectionrenderpass.h" -#include "timeline/timelineformattime.h" +#include <tracing/timelinenotesrenderpass.h> +#include <tracing/timelineitemsrenderpass.h> +#include <tracing/timelineselectionrenderpass.h> +#include <tracing/timelineformattime.h> #include <QCoreApplication> #include <QVector> diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp index c274469aa82..de1c3b9ea2e 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp @@ -26,7 +26,7 @@ #include "qmlprofilerstatisticsmodel.h" #include "qmlprofilermodelmanager.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <utils/algorithm.h> #include <utils/qtcassert.h> diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp index d3248e2201e..ffc92a37a01 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp @@ -28,7 +28,7 @@ #include <coreplugin/minisplitter.h> #include <utils/qtcassert.h> -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QHeaderView> #include <QApplication> diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h index 0724f181cc9..3c770dd98a2 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h @@ -27,8 +27,9 @@ #include "qmlprofiler_global.h" #include "qmlprofilermodelmanager.h" -#include "timeline/timelinemodel.h" -#include "timeline/timelinemodelaggregator.h" + +#include <tracing/timelinemodel.h> +#include <tracing/timelinemodelaggregator.h> namespace QmlProfiler { diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.h b/src/plugins/qmlprofiler/qmlprofilertracefile.h index 0d9321a5290..60198ee3d45 100644 --- a/src/plugins/qmlprofiler/qmlprofilertracefile.h +++ b/src/plugins/qmlprofiler/qmlprofilertracefile.h @@ -32,7 +32,7 @@ #include "qmlevent.h" #include "qmlprofilermodelmanager.h" -#include <timeline/timelinetracefile.h> +#include <tracing/timelinetracefile.h> #include <QFutureInterface> #include <QObject> diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index d654869f200..7e7d77bfb93 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -42,12 +42,12 @@ // Communication with the other views (limit events to range) #include "qmlprofilerviewmanager.h" -#include "timeline/timelinezoomcontrol.h" -#include "timeline/timelinemodelaggregator.h" -#include "timeline/timelinerenderer.h" -#include "timeline/timelineoverviewrenderer.h" -#include "timeline/timelinetheme.h" -#include "timeline/timelineformattime.h" +#include <tracing/timelinezoomcontrol.h> +#include <tracing/timelinemodelaggregator.h> +#include <tracing/timelinerenderer.h> +#include <tracing/timelineoverviewrenderer.h> +#include <tracing/timelinetheme.h> +#include <tracing/timelineformattime.h> #include <aggregation/aggregate.h> // Needed for the load&save actions in the context menu @@ -172,7 +172,7 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag d->m_modelProxy); d->m_mainView->rootContext()->setContextProperty(QLatin1String("zoomControl"), d->m_zoomControl); - d->m_mainView->setSource(QUrl(QLatin1String("qrc:/timeline/MainView.qml"))); + d->m_mainView->setSource(QUrl(QLatin1String("qrc:/tracing/MainView.qml"))); connect(d->m_modelProxy, &Timeline::TimelineModelAggregator::updateCursorPosition, this, &QmlProfilerTraceView::updateCursorPosition); diff --git a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp index b85aa561352..e0a289c82b6 100644 --- a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp +++ b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp @@ -27,7 +27,7 @@ #include "qmlprofilermodelmanager.h" #include "qmlprofilereventtypes.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QCoreApplication> #include <QDebug> diff --git a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp index 6a9941e662c..ddd9c80c3c4 100644 --- a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp @@ -25,7 +25,7 @@ #include "debugmessagesmodel_test.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QtTest> diff --git a/src/plugins/qmlprofiler/tests/flamegraphmodel_test.h b/src/plugins/qmlprofiler/tests/flamegraphmodel_test.h index 627a217d20c..95e7f0b30b8 100644 --- a/src/plugins/qmlprofiler/tests/flamegraphmodel_test.h +++ b/src/plugins/qmlprofiler/tests/flamegraphmodel_test.h @@ -28,7 +28,7 @@ #include <qmlprofiler/flamegraphmodel.h> #include <qmlprofiler/qmlprofilermodelmanager.h> -#include <timeline/timelinemodelaggregator.h> +#include <tracing/timelinemodelaggregator.h> #include <QObject> diff --git a/src/plugins/qmlprofiler/tests/flamegraphview_test.h b/src/plugins/qmlprofiler/tests/flamegraphview_test.h index 2729306412f..eeb5f0d829f 100644 --- a/src/plugins/qmlprofiler/tests/flamegraphview_test.h +++ b/src/plugins/qmlprofiler/tests/flamegraphview_test.h @@ -28,7 +28,7 @@ #include <qmlprofiler/flamegraphview.h> #include <qmlprofiler/qmlprofilermodelmanager.h> -#include <timeline/timelinemodelaggregator.h> +#include <tracing/timelinemodelaggregator.h> #include <QObject> diff --git a/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp b/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp index e56f27aa4a5..5979e1e9669 100644 --- a/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp @@ -24,8 +24,9 @@ ****************************************************************************/ #include "inputeventsmodel_test.h" -#include "timeline/timelinemodel_p.h" -#include "timeline/timelineformattime.h" + +#include <tracing/timelinemodel_p.h> +#include <tracing/timelineformattime.h> #include <QtTest> diff --git a/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp b/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp index 585eab951b4..5174e0833c0 100644 --- a/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "pixmapcachemodel_test.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QtTest> namespace QmlProfiler { diff --git a/src/plugins/qmlprofiler/tests/qmlprofileranimationsmodel_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofileranimationsmodel_test.cpp index bccc4113b72..4e67785273b 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofileranimationsmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofileranimationsmodel_test.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "qmlprofileranimationsmodel_test.h" -#include <timeline/timelineformattime.h> +#include <tracing/timelineformattime.h> #include <QtTest> namespace QmlProfiler { diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerbindingloopsrenderpass_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerbindingloopsrenderpass_test.cpp index ab451e04e3c..268be44562c 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerbindingloopsrenderpass_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerbindingloopsrenderpass_test.cpp @@ -28,8 +28,8 @@ #include <qmlprofiler/qmlprofilerbindingloopsrenderpass.h> #include <qmlprofiler/qmlprofilerrangemodel.h> -#include <timeline/timelineabstractrenderer.h> -#include <timeline/runscenegraphtest.h> +#include <tracing/timelineabstractrenderer.h> +#include <tracing/runscenegraphtest.h> #include <QtTest> namespace QmlProfiler { |