Move Timeline and FlameGraph into a common "Tracing" library

This allows us to share code between the two, in particular the QML code for the Details window, and the theme code. This way we can potentially deduplicate some code. Change-Id: I3a0d26b18488bd2a46b5b077b5b5d79ac2dfc5ce Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-03 09:50:11 +02:00
parent b9b2f2c187
commit 734611131d
167 changed files with 229 additions and 306 deletions
--- 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 {
--- 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>
--- 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>
--- 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 {
--- 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
--- 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>
--- 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>
--- 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" }
--- 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 += \
--- 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>
--- 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>

--- 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>

--- 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>
--- 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>

--- 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>
--- 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>

--- 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>
--- 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 {

--- 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>
--- 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);
--- 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>
--- 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>

--- 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>

--- 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>

--- 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>

--- 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 {
--- 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 {
--- 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 {