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 <[email protected]>
Reviewed-by: Eike Ziller <[email protected]>

93 files changed, 86 insertions, 169 deletions

diff --git a/src/libs/flamegraph/flamegraph.pro b/src/libs/flamegraph/flamegraph.pro
deleted file mode 100644
index f9fb063e809..00000000000
--- a/src/libs/flamegraph/flamegraph.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-QT += qml quick
-DEFINES += FLAMEGRAPH_LIBRARY
-
-include(../../qtcreatorlibrary.pri)
-
-SOURCES += \
-    $$PWD/flamegraph.cpp
-
-HEADERS += \
-    $$PWD/flamegraph.h \
-    $$PWD/flamegraph_global.h \
-    $$PWD/flamegraphattached.h
-
-RESOURCES += \
-    $$PWD/qml/flamegraph.qrc
-
diff --git a/src/libs/flamegraph/flamegraph.qbs b/src/libs/flamegraph/flamegraph.qbs
deleted file mode 100644
index 2a44780532a..00000000000
--- a/src/libs/flamegraph/flamegraph.qbs
+++ /dev/null
@@ -1,30 +0,0 @@
-import qbs 1.0
-
-import QtcLibrary
-
-Project {
-    name: "FlameGraph"
-
-    QtcDevHeaders { }
-
-    QtcLibrary {
-        Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] }
-
-        Group {
-            name: "General"
-            files: [
-                "flamegraph.cpp", "flamegraph.h",
-                "flamegraph_global.h",
-                "flamegraphattached.h",
-            ]
-        }
-
-        Group {
-            name: "QML"
-            prefix: "qml/"
-            files: ["flamegraph.qrc"]
-        }
-
-        cpp.defines: base.concat("FLAMEGRAPH_LIBRARY")
-    }
-}
diff --git a/src/libs/flamegraph/flamegraph_dependencies.pri b/src/libs/flamegraph/flamegraph_dependencies.pri
deleted file mode 100644
index 6705c38c3db..00000000000
--- a/src/libs/flamegraph/flamegraph_dependencies.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-QTC_LIB_NAME = FlameGraph
-
diff --git a/src/libs/flamegraph/flamegraph_global.h b/src/libs/flamegraph/flamegraph_global.h
deleted file mode 100644
index 663c6abe7f4..00000000000
--- a/src/libs/flamegraph/flamegraph_global.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QtGlobal>
-
-#if defined(FLAMEGRAPH_LIBRARY)
-#  define FLAMEGRAPH_EXPORT Q_DECL_EXPORT
-#else
-#  define FLAMEGRAPH_EXPORT Q_DECL_IMPORT
-#endif
diff --git a/src/libs/flamegraph/qml/flamegraph.qrc b/src/libs/flamegraph/qml/flamegraph.qrc
deleted file mode 100644
index cb5c19a9ebf..00000000000
--- a/src/libs/flamegraph/qml/flamegraph.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/flamegraph">
-        <file>FlameGraphText.qml</file>
-        <file>FlameGraphDetails.qml</file>
-        <file>FlameGraphDelegate.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 669dc0183ab..b6b40f78e7c 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -19,8 +19,7 @@ SUBDIRS   = \
 
 qtHaveModule(quick) {
     SUBDIRS += \
-        flamegraph \
-        timeline
+        tracing
 }
 
 for(l, SUBDIRS) {
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
index 4eedda662ce..d1b205a7341 100644
--- a/src/libs/libs.qbs
+++ b/src/libs/libs.qbs
@@ -7,7 +7,6 @@ Project {
         "clangsupport/clangsupport.qbs",
         "cplusplus/cplusplus.qbs",
         "extensionsystem/extensionsystem.qbs",
-        "flamegraph/flamegraph.qbs",
         "glsl/glsl.qbs",
         "languageutils/languageutils.qbs",
         "modelinglib/modelinglib.qbs",
@@ -17,7 +16,7 @@ Project {
         "qtcreatorcdbext/qtcreatorcdbext.qbs",
         "sqlite/sqlite.qbs",
         "ssh/ssh.qbs",
-        "timeline/timeline.qbs",
+        "tracing/tracing.qbs",
         "utils/process_stub.qbs",
         "utils/process_ctrlc_stub.qbs",
         "utils/utils.qbs",
diff --git a/src/libs/timeline/README b/src/libs/tracing/README
index 13b4c6b11a1..13b4c6b11a1 100644
--- a/src/libs/timeline/README
+++ b/src/libs/tracing/README
diff --git a/src/libs/flamegraph/flamegraph.cpp b/src/libs/tracing/flamegraph.cpp
index 2fa38313edc..2fa38313edc 100644
--- a/src/libs/flamegraph/flamegraph.cpp
+++ b/src/libs/tracing/flamegraph.cpp
diff --git a/src/libs/flamegraph/flamegraph.h b/src/libs/tracing/flamegraph.h
index 8b694cb0649..a01c44ea39e 100644
--- a/src/libs/flamegraph/flamegraph.h
+++ b/src/libs/tracing/flamegraph.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "flamegraph_global.h"
+#include "tracing_global.h"
 #include "flamegraphattached.h"
 
 #include <QQuickItem>
@@ -33,7 +33,7 @@
 
 namespace FlameGraph {
 
-class FLAMEGRAPH_EXPORT FlameGraph : public QQuickItem
+class TRACING_EXPORT FlameGraph : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
diff --git a/src/libs/flamegraph/flamegraphattached.h b/src/libs/tracing/flamegraphattached.h
index d087e54d7c0..05cc09627be 100644
--- a/src/libs/flamegraph/flamegraphattached.h
+++ b/src/libs/tracing/flamegraphattached.h
@@ -25,14 +25,14 @@
 
 #pragma once
 
-#include "flamegraph_global.h"
+#include "tracing_global.h"
 #include <QObject>
 #include <QModelIndex>
 #include <QVariant>
 
 namespace FlameGraph {
 
-class FLAMEGRAPH_EXPORT FlameGraphAttached : public QObject
+class TRACING_EXPORT FlameGraphAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal relativeSize READ relativeSize WRITE setRelativeSize
diff --git a/src/libs/timeline/qml/ButtonsBar.qml b/src/libs/tracing/qml/ButtonsBar.qml
index a151eb9f91d..a151eb9f91d 100644
--- a/src/libs/timeline/qml/ButtonsBar.qml
+++ b/src/libs/tracing/qml/ButtonsBar.qml
diff --git a/src/libs/timeline/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml
index e6dd396547a..e6dd396547a 100644
--- a/src/libs/timeline/qml/CategoryLabel.qml
+++ b/src/libs/tracing/qml/CategoryLabel.qml
diff --git a/src/libs/timeline/qml/Detail.qml b/src/libs/tracing/qml/Detail.qml
index a1cbe86f10b..a1cbe86f10b 100644
--- a/src/libs/timeline/qml/Detail.qml
+++ b/src/libs/tracing/qml/Detail.qml
diff --git a/src/libs/flamegraph/qml/FlameGraphDelegate.qml b/src/libs/tracing/qml/FlameGraphDelegate.qml
index 8a8f90c99f6..8a8f90c99f6 100644
--- a/src/libs/flamegraph/qml/FlameGraphDelegate.qml
+++ b/src/libs/tracing/qml/FlameGraphDelegate.qml
diff --git a/src/libs/flamegraph/qml/FlameGraphDetails.qml b/src/libs/tracing/qml/FlameGraphDetails.qml
index 99ff3989b6e..99ff3989b6e 100644
--- a/src/libs/flamegraph/qml/FlameGraphDetails.qml
+++ b/src/libs/tracing/qml/FlameGraphDetails.qml
diff --git a/src/libs/flamegraph/qml/FlameGraphText.qml b/src/libs/tracing/qml/FlameGraphText.qml
index a989b393556..a989b393556 100644
--- a/src/libs/flamegraph/qml/FlameGraphText.qml
+++ b/src/libs/tracing/qml/FlameGraphText.qml
diff --git a/src/libs/timeline/qml/ImageToolButton.qml b/src/libs/tracing/qml/ImageToolButton.qml
index 353e38f122b..353e38f122b 100644
--- a/src/libs/timeline/qml/ImageToolButton.qml
+++ b/src/libs/tracing/qml/ImageToolButton.qml
diff --git a/src/libs/timeline/qml/MainView.qml b/src/libs/tracing/qml/MainView.qml
index 2c0aa1258e5..2c0aa1258e5 100644
--- a/src/libs/timeline/qml/MainView.qml
+++ b/src/libs/tracing/qml/MainView.qml
diff --git a/src/libs/timeline/qml/Overview.qml b/src/libs/tracing/qml/Overview.qml
index feda483bbb4..feda483bbb4 100644
--- a/src/libs/timeline/qml/Overview.qml
+++ b/src/libs/tracing/qml/Overview.qml
diff --git a/src/libs/timeline/qml/RangeDetails.qml b/src/libs/tracing/qml/RangeDetails.qml
index c6b057cc6c5..c6b057cc6c5 100644
--- a/src/libs/timeline/qml/RangeDetails.qml
+++ b/src/libs/tracing/qml/RangeDetails.qml
diff --git a/src/libs/timeline/qml/RangeMover.qml b/src/libs/tracing/qml/RangeMover.qml
index f11505e3571..f11505e3571 100644
--- a/src/libs/timeline/qml/RangeMover.qml
+++ b/src/libs/tracing/qml/RangeMover.qml
diff --git a/src/libs/timeline/qml/RowLabel.qml b/src/libs/tracing/qml/RowLabel.qml
index be394b5e7e4..be394b5e7e4 100644
--- a/src/libs/timeline/qml/RowLabel.qml
+++ b/src/libs/tracing/qml/RowLabel.qml
diff --git a/src/libs/timeline/qml/SelectionRange.qml b/src/libs/tracing/qml/SelectionRange.qml
index 9f111b75c4c..9f111b75c4c 100644
--- a/src/libs/timeline/qml/SelectionRange.qml
+++ b/src/libs/tracing/qml/SelectionRange.qml
diff --git a/src/libs/timeline/qml/SelectionRangeDetails.qml b/src/libs/tracing/qml/SelectionRangeDetails.qml
index 458e5cf7ad4..458e5cf7ad4 100644
--- a/src/libs/timeline/qml/SelectionRangeDetails.qml
+++ b/src/libs/tracing/qml/SelectionRangeDetails.qml
diff --git a/src/libs/timeline/qml/TimeDisplay.qml b/src/libs/tracing/qml/TimeDisplay.qml
index 4351c8260e5..4351c8260e5 100644
--- a/src/libs/timeline/qml/TimeDisplay.qml
+++ b/src/libs/tracing/qml/TimeDisplay.qml
diff --git a/src/libs/timeline/qml/TimeMarks.qml b/src/libs/tracing/qml/TimeMarks.qml
index 2fc1ef41c8a..2fc1ef41c8a 100644
--- a/src/libs/timeline/qml/TimeMarks.qml
+++ b/src/libs/tracing/qml/TimeMarks.qml
diff --git a/src/libs/timeline/qml/TimelineContent.qml b/src/libs/tracing/qml/TimelineContent.qml
index 636d7073567..636d7073567 100644
--- a/src/libs/timeline/qml/TimelineContent.qml
+++ b/src/libs/tracing/qml/TimelineContent.qml
diff --git a/src/libs/timeline/qml/TimelineLabels.qml b/src/libs/tracing/qml/TimelineLabels.qml
index 71434822f4b..71434822f4b 100644
--- a/src/libs/timeline/qml/TimelineLabels.qml
+++ b/src/libs/tracing/qml/TimelineLabels.qml
diff --git a/src/libs/timeline/qml/TimelineRulers.qml b/src/libs/tracing/qml/TimelineRulers.qml
index c095bd280e2..c095bd280e2 100644
--- a/src/libs/timeline/qml/TimelineRulers.qml
+++ b/src/libs/tracing/qml/TimelineRulers.qml
diff --git a/src/libs/timeline/qml/TimelineText.qml b/src/libs/tracing/qml/TimelineText.qml
index dc354875d55..dc354875d55 100644
--- a/src/libs/timeline/qml/TimelineText.qml
+++ b/src/libs/tracing/qml/TimelineText.qml
diff --git a/src/libs/timeline/qml/ico_edit.png b/src/libs/tracing/qml/ico_edit.png
index 276e49fac58..276e49fac58 100644
--- a/src/libs/timeline/qml/ico_edit.png
+++ b/src/libs/tracing/qml/ico_edit.png
diff --git a/src/libs/timeline/qml/[email protected] b/src/libs/tracing/qml/[email protected]
index 5073df7eddc..5073df7eddc 100644
--- a/src/libs/timeline/qml/[email protected]
+++ b/src/libs/tracing/qml/[email protected]
diff --git a/src/libs/timeline/qml/ico_rangeselected.png b/src/libs/tracing/qml/ico_rangeselected.png
index 1d4e0284f9a..1d4e0284f9a 100644
--- a/src/libs/timeline/qml/ico_rangeselected.png
+++ b/src/libs/tracing/qml/ico_rangeselected.png
diff --git a/src/libs/timeline/qml/[email protected] b/src/libs/tracing/qml/[email protected]
index d108be37e0a..d108be37e0a 100644
--- a/src/libs/timeline/qml/[email protected]
+++ b/src/libs/tracing/qml/[email protected]
diff --git a/src/libs/timeline/qml/ico_rangeselection.png b/src/libs/tracing/qml/ico_rangeselection.png
index 546bf8beccd..546bf8beccd 100644
--- a/src/libs/timeline/qml/ico_rangeselection.png
+++ b/src/libs/tracing/qml/ico_rangeselection.png
diff --git a/src/libs/timeline/qml/[email protected] b/src/libs/tracing/qml/[email protected]
index 9f200fe43a8..9f200fe43a8 100644
--- a/src/libs/timeline/qml/[email protected]
+++ b/src/libs/tracing/qml/[email protected]
diff --git a/src/libs/timeline/qml/ico_selectionmode.png b/src/libs/tracing/qml/ico_selectionmode.png
index fcf28531d0c..fcf28531d0c 100644
--- a/src/libs/timeline/qml/ico_selectionmode.png
+++ b/src/libs/tracing/qml/ico_selectionmode.png
diff --git a/src/libs/timeline/qml/[email protected] b/src/libs/tracing/qml/[email protected]
index b34991e0790..b34991e0790 100644
--- a/src/libs/timeline/qml/[email protected]
+++ b/src/libs/tracing/qml/[email protected]
diff --git a/src/libs/timeline/qml/notes.frag b/src/libs/tracing/qml/notes.frag
index 0f174ca28de..0f174ca28de 100644
--- a/src/libs/timeline/qml/notes.frag
+++ b/src/libs/tracing/qml/notes.frag
diff --git a/src/libs/timeline/qml/notes.vert b/src/libs/tracing/qml/notes.vert
index be3c8700b8c..be3c8700b8c 100644
--- a/src/libs/timeline/qml/notes.vert
+++ b/src/libs/tracing/qml/notes.vert
diff --git a/src/libs/timeline/qml/range_handle.png b/src/libs/tracing/qml/range_handle.png
index 94303303422..94303303422 100644
--- a/src/libs/timeline/qml/range_handle.png
+++ b/src/libs/tracing/qml/range_handle.png
diff --git a/src/libs/timeline/qml/[email protected] b/src/libs/tracing/qml/[email protected]
index 3c954051c61..3c954051c61 100644
--- a/src/libs/timeline/qml/[email protected]
+++ b/src/libs/tracing/qml/[email protected]
diff --git a/src/libs/timeline/qml/timelineitems.frag b/src/libs/tracing/qml/timelineitems.frag
index 97d79770f64..97d79770f64 100644
--- a/src/libs/timeline/qml/timelineitems.frag
+++ b/src/libs/tracing/qml/timelineitems.frag
diff --git a/src/libs/timeline/qml/timelineitems.vert b/src/libs/tracing/qml/timelineitems.vert
index 153bf693db2..153bf693db2 100644
--- a/src/libs/timeline/qml/timelineitems.vert
+++ b/src/libs/tracing/qml/timelineitems.vert
diff --git a/src/libs/timeline/qml/timeline.qrc b/src/libs/tracing/qml/tracing.qrc
index ca6493ba5c4..c59a7ab93ae 100644
--- a/src/libs/timeline/qml/timeline.qrc
+++ b/src/libs/tracing/qml/tracing.qrc
@@ -1,34 +1,37 @@
 <RCC>
-    <qresource prefix="/timeline">
-        <file>Detail.qml</file>
+    <qresource prefix="/tracing">
+        <file>ButtonsBar.qml</file>
         <file>CategoryLabel.qml</file>
-        <file>MainView.qml</file>
-        <file>RangeDetails.qml</file>
-        <file>RangeMover.qml</file>
-        <file>TimeDisplay.qml</file>
+        <file>Detail.qml</file>
+        <file>FlameGraphDelegate.qml</file>
+        <file>FlameGraphDetails.qml</file>
+        <file>FlameGraphText.qml</file>
         <file>ico_edit.png</file>
         <file>[email protected]</file>
-        <file>TimeMarks.qml</file>
+        <file>ico_rangeselected.png</file>
+        <file>[email protected]</file>
+        <file>ico_rangeselection.png</file>
+        <file>[email protected]</file>
+        <file>ico_selectionmode.png</file>
+        <file>[email protected]</file>
+        <file>ImageToolButton.qml</file>
+        <file>MainView.qml</file>
+        <file>notes.frag</file>
+        <file>notes.vert</file>
         <file>Overview.qml</file>
+        <file>range_handle.png</file>
+        <file>RangeDetails.qml</file>
+        <file>RangeMover.qml</file>
+        <file>RowLabel.qml</file>
         <file>SelectionRange.qml</file>
         <file>SelectionRangeDetails.qml</file>
-        <file>range_handle.png</file>
-        <file>ico_selectionmode.png</file>
-        <file>[email protected]</file>
-        <file>ico_rangeselection.png</file>
-        <file>[email protected]</file>
-        <file>ico_rangeselected.png</file>
-        <file>[email protected]</file>
-        <file>ButtonsBar.qml</file>
-        <file>timelineitems.vert</file>
+        <file>TimeDisplay.qml</file>
+        <file>TimelineContent.qml</file>
         <file>timelineitems.frag</file>
-        <file>notes.vert</file>
-        <file>notes.frag</file>
+        <file>timelineitems.vert</file>
         <file>TimelineLabels.qml</file>
-        <file>TimelineContent.qml</file>
-        <file>RowLabel.qml</file>
-        <file>TimelineText.qml</file>
-        <file>ImageToolButton.qml</file>
         <file>TimelineRulers.qml</file>
+        <file>TimelineText.qml</file>
+        <file>TimeMarks.qml</file>
     </qresource>
 </RCC>
diff --git a/src/libs/timeline/runscenegraphtest.cpp b/src/libs/tracing/runscenegraphtest.cpp
index c1210aa5e0c..c1210aa5e0c 100644
--- a/src/libs/timeline/runscenegraphtest.cpp
+++ b/src/libs/tracing/runscenegraphtest.cpp
diff --git a/src/libs/timeline/runscenegraphtest.h b/src/libs/tracing/runscenegraphtest.h
index 39ac429f3eb..f387e8e956d 100644
--- a/src/libs/timeline/runscenegraphtest.h
+++ b/src/libs/tracing/runscenegraphtest.h
@@ -25,11 +25,11 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 #include <QSGNode>
 
 namespace Timeline {
 
-void TIMELINE_EXPORT runSceneGraphTest(QSGNode *node);
+void TRACING_EXPORT runSceneGraphTest(QSGNode *node);
 
 } // namespace Timeline
diff --git a/src/libs/timeline/timelineabstractrenderer.cpp b/src/libs/tracing/timelineabstractrenderer.cpp
index 4b9f775c3b5..4b9f775c3b5 100644
--- a/src/libs/timeline/timelineabstractrenderer.cpp
+++ b/src/libs/tracing/timelineabstractrenderer.cpp
diff --git a/src/libs/timeline/timelineabstractrenderer.h b/src/libs/tracing/timelineabstractrenderer.h
index 444e143171c..11b2b75fc81 100644
--- a/src/libs/timeline/timelineabstractrenderer.h
+++ b/src/libs/tracing/timelineabstractrenderer.h
@@ -36,7 +36,7 @@
 namespace Timeline {
 
 
-class TIMELINE_EXPORT TimelineAbstractRenderer : public QQuickItem
+class TRACING_EXPORT TimelineAbstractRenderer : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(Timeline::TimelineModel *model READ model WRITE setModel NOTIFY modelChanged)
diff --git a/src/libs/timeline/timelineabstractrenderer_p.h b/src/libs/tracing/timelineabstractrenderer_p.h
index d2c3917e9de..0626710cd86 100644
--- a/src/libs/timeline/timelineabstractrenderer_p.h
+++ b/src/libs/tracing/timelineabstractrenderer_p.h
@@ -29,7 +29,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineAbstractRenderer::TimelineAbstractRendererPrivate {
+class TRACING_EXPORT TimelineAbstractRenderer::TimelineAbstractRendererPrivate {
 public:
     TimelineAbstractRendererPrivate();
     virtual ~TimelineAbstractRendererPrivate();
diff --git a/src/libs/timeline/timelineformattime.cpp b/src/libs/tracing/timelineformattime.cpp
index 54f12d90dd8..54f12d90dd8 100644
--- a/src/libs/timeline/timelineformattime.cpp
+++ b/src/libs/tracing/timelineformattime.cpp
diff --git a/src/libs/timeline/timelineformattime.h b/src/libs/tracing/timelineformattime.h
index d4f568ae0d2..0ed8a5a3f40 100644
--- a/src/libs/timeline/timelineformattime.h
+++ b/src/libs/tracing/timelineformattime.h
@@ -24,16 +24,16 @@
 ****************************************************************************/
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 #include <QString>
 #include <QObject>
 #include <limits>
 
 namespace Timeline {
-QString TIMELINE_EXPORT formatTime(qint64 timestamp,
+QString TRACING_EXPORT formatTime(qint64 timestamp,
                                    qint64 reference = std::numeric_limits<qint64>::max());
 
-class TIMELINE_EXPORT TimeFormatter : public QObject {
+class TRACING_EXPORT TimeFormatter : public QObject {
     Q_OBJECT
 public:
     Q_INVOKABLE QString format(qint64 timestamp, qint64 reference)
diff --git a/src/libs/timeline/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp
index cf79bbe5fd5..7dd88406e5b 100644
--- a/src/libs/timeline/timelineitemsrenderpass.cpp
+++ b/src/libs/tracing/timelineitemsrenderpass.cpp
@@ -453,8 +453,8 @@ private:
 TimelineItemsMaterialShader::TimelineItemsMaterialShader()
     : QSGMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/timeline/timelineitems.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/timeline/timelineitems.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/tracing/timelineitems.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/tracing/timelineitems.frag"));
 }
 
 void TimelineItemsMaterialShader::updateState(const RenderState &state, QSGMaterial *newMaterial,
diff --git a/src/libs/timeline/timelineitemsrenderpass.h b/src/libs/tracing/timelineitemsrenderpass.h
index f1a8cc4a40f..597b1fa98d4 100644
--- a/src/libs/timeline/timelineitemsrenderpass.h
+++ b/src/libs/tracing/timelineitemsrenderpass.h
@@ -89,7 +89,7 @@ private:
     void setBottom(const OpaqueColoredPoint2DWithSize *master);
 };
 
-class TIMELINE_EXPORT TimelineItemsRenderPass : public TimelineRenderPass
+class TRACING_EXPORT TimelineItemsRenderPass : public TimelineRenderPass
 {
 public:
     static const TimelineItemsRenderPass *instance();
diff --git a/src/libs/timeline/timelinemodel.cpp b/src/libs/tracing/timelinemodel.cpp
index e2f28e18497..e2f28e18497 100644
--- a/src/libs/timeline/timelinemodel.cpp
+++ b/src/libs/tracing/timelinemodel.cpp
diff --git a/src/libs/timeline/timelinemodel.h b/src/libs/tracing/timelinemodel.h
index 010a4f2aef6..9bf3f062695 100644
--- a/src/libs/timeline/timelinemodel.h
+++ b/src/libs/tracing/timelinemodel.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 #include "timelinerenderpass.h"
 #include <QVariant>
 #include <QColor>
@@ -33,7 +33,7 @@
 namespace Timeline {
 class TimelineModelAggregator;
 
-class TIMELINE_EXPORT TimelineModel : public QObject
+class TRACING_EXPORT TimelineModel : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int modelId READ modelId CONSTANT)
diff --git a/src/libs/timeline/timelinemodel_p.h b/src/libs/tracing/timelinemodel_p.h
index 1c8a44f735b..53136571be2 100644
--- a/src/libs/timeline/timelinemodel_p.h
+++ b/src/libs/tracing/timelinemodel_p.h
@@ -37,7 +37,7 @@ struct HueLookupTable {
     QRgb operator[](int hue) const { return table[hue % 360]; }
 };
 
-class TIMELINE_EXPORT TimelineModel::TimelineModelPrivate {
+class TRACING_EXPORT TimelineModel::TimelineModelPrivate {
 public:
 
     static const HueLookupTable hueTable;
diff --git a/src/libs/timeline/timelinemodelaggregator.cpp b/src/libs/tracing/timelinemodelaggregator.cpp
index 30636356aec..30636356aec 100644
--- a/src/libs/timeline/timelinemodelaggregator.cpp
+++ b/src/libs/tracing/timelinemodelaggregator.cpp
diff --git a/src/libs/timeline/timelinemodelaggregator.h b/src/libs/tracing/timelinemodelaggregator.h
index e1f7a01cab7..ddcf4e96a14 100644
--- a/src/libs/timeline/timelinemodelaggregator.h
+++ b/src/libs/tracing/timelinemodelaggregator.h
@@ -30,7 +30,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineModelAggregator : public QObject
+class TRACING_EXPORT TimelineModelAggregator : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
diff --git a/src/libs/timeline/timelinenotesmodel.cpp b/src/libs/tracing/timelinenotesmodel.cpp
index 13adaf72795..13adaf72795 100644
--- a/src/libs/timeline/timelinenotesmodel.cpp
+++ b/src/libs/tracing/timelinenotesmodel.cpp
diff --git a/src/libs/timeline/timelinenotesmodel.h b/src/libs/tracing/timelinenotesmodel.h
index a343608cbd2..6583c5bb8d1 100644
--- a/src/libs/timeline/timelinenotesmodel.h
+++ b/src/libs/tracing/timelinenotesmodel.h
@@ -29,7 +29,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineNotesModel : public QObject
+class TRACING_EXPORT TimelineNotesModel : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY changed)
diff --git a/src/libs/timeline/timelinenotesmodel_p.h b/src/libs/tracing/timelinenotesmodel_p.h
index dd64fec2a99..dd64fec2a99 100644
--- a/src/libs/timeline/timelinenotesmodel_p.h
+++ b/src/libs/tracing/timelinenotesmodel_p.h
diff --git a/src/libs/timeline/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp
index 8c80c11e2fe..932473183de 100644
--- a/src/libs/timeline/timelinenotesrenderpass.cpp
+++ b/src/libs/tracing/timelinenotesrenderpass.cpp
@@ -235,8 +235,8 @@ private:
 NotesMaterialShader::NotesMaterialShader()
     : QSGMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/timeline/notes.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/timeline/notes.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/tracing/notes.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/tracing/notes.frag"));
 }
 
 void NotesMaterialShader::updateState(const RenderState &state, QSGMaterial *, QSGMaterial *)
diff --git a/src/libs/timeline/timelinenotesrenderpass.h b/src/libs/tracing/timelinenotesrenderpass.h
index a84193747c9..57e1548771e 100644
--- a/src/libs/timeline/timelinenotesrenderpass.h
+++ b/src/libs/tracing/timelinenotesrenderpass.h
@@ -30,7 +30,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineNotesRenderPass : public TimelineRenderPass
+class TRACING_EXPORT TimelineNotesRenderPass : public TimelineRenderPass
 {
 public:
     static const TimelineNotesRenderPass *instance();
diff --git a/src/libs/timeline/timelineoverviewrenderer.cpp b/src/libs/tracing/timelineoverviewrenderer.cpp
index 8b78c54a1fa..8b78c54a1fa 100644
--- a/src/libs/timeline/timelineoverviewrenderer.cpp
+++ b/src/libs/tracing/timelineoverviewrenderer.cpp
diff --git a/src/libs/timeline/timelineoverviewrenderer.h b/src/libs/tracing/timelineoverviewrenderer.h
index d5c946dde78..a1a684c5b92 100644
--- a/src/libs/timeline/timelineoverviewrenderer.h
+++ b/src/libs/tracing/timelineoverviewrenderer.h
@@ -29,7 +29,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineOverviewRenderer : public TimelineAbstractRenderer
+class TRACING_EXPORT TimelineOverviewRenderer : public TimelineAbstractRenderer
 {
 public:
     TimelineOverviewRenderer(QQuickItem *parent = 0);
diff --git a/src/libs/timeline/timelineoverviewrenderer_p.h b/src/libs/tracing/timelineoverviewrenderer_p.h
index d45d4d716bd..d45d4d716bd 100644
--- a/src/libs/timeline/timelineoverviewrenderer_p.h
+++ b/src/libs/tracing/timelineoverviewrenderer_p.h
diff --git a/src/libs/timeline/timelinerenderer.cpp b/src/libs/tracing/timelinerenderer.cpp
index 182a7aadd63..182a7aadd63 100644
--- a/src/libs/timeline/timelinerenderer.cpp
+++ b/src/libs/tracing/timelinerenderer.cpp
diff --git a/src/libs/timeline/timelinerenderer.h b/src/libs/tracing/timelinerenderer.h
index 09814d07f7a..7b7f035a469 100644
--- a/src/libs/timeline/timelinerenderer.h
+++ b/src/libs/tracing/timelinerenderer.h
@@ -36,7 +36,7 @@
 namespace Timeline {
 
 
-class TIMELINE_EXPORT TimelineRenderer : public TimelineAbstractRenderer
+class TRACING_EXPORT TimelineRenderer : public TimelineAbstractRenderer
 {
     Q_OBJECT
 
diff --git a/src/libs/timeline/timelinerenderer_p.h b/src/libs/tracing/timelinerenderer_p.h
index 714206dc5d0..714206dc5d0 100644
--- a/src/libs/timeline/timelinerenderer_p.h
+++ b/src/libs/tracing/timelinerenderer_p.h
diff --git a/src/libs/timeline/timelinerenderpass.cpp b/src/libs/tracing/timelinerenderpass.cpp
index 7c87f239c6c..7c87f239c6c 100644
--- a/src/libs/timeline/timelinerenderpass.cpp
+++ b/src/libs/tracing/timelinerenderpass.cpp
diff --git a/src/libs/timeline/timelinerenderpass.h b/src/libs/tracing/timelinerenderpass.h
index f7b559b4a23..3ebb3b03b16 100644
--- a/src/libs/timeline/timelinerenderpass.h
+++ b/src/libs/tracing/timelinerenderpass.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 #include <QVector>
 
 QT_FORWARD_DECLARE_CLASS(QSGNode)
@@ -34,9 +34,9 @@ namespace Timeline {
 class TimelineAbstractRenderer;
 class TimelineRenderState;
 
-class TIMELINE_EXPORT TimelineRenderPass {
+class TRACING_EXPORT TimelineRenderPass {
 public:
-    class TIMELINE_EXPORT State {
+    class TRACING_EXPORT State {
     public:
         virtual const QVector<QSGNode *> &expandedRows() const;
         virtual const QVector<QSGNode *> &collapsedRows() const;
diff --git a/src/libs/timeline/timelinerenderstate.cpp b/src/libs/tracing/timelinerenderstate.cpp
index f897496c56c..f897496c56c 100644
--- a/src/libs/timeline/timelinerenderstate.cpp
+++ b/src/libs/tracing/timelinerenderstate.cpp
diff --git a/src/libs/timeline/timelinerenderstate.h b/src/libs/tracing/timelinerenderstate.h
index 246c9345d4f..c756f1606c6 100644
--- a/src/libs/timeline/timelinerenderstate.h
+++ b/src/libs/tracing/timelinerenderstate.h
@@ -31,7 +31,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineRenderState {
+class TRACING_EXPORT TimelineRenderState {
 public:
     TimelineRenderState(qint64 start, qint64 end, float scale, int numPasses);
     ~TimelineRenderState();
diff --git a/src/libs/timeline/timelinerenderstate_p.h b/src/libs/tracing/timelinerenderstate_p.h
index 3399e6b9af5..3399e6b9af5 100644
--- a/src/libs/timeline/timelinerenderstate_p.h
+++ b/src/libs/tracing/timelinerenderstate_p.h
diff --git a/src/libs/timeline/timelineselectionrenderpass.cpp b/src/libs/tracing/timelineselectionrenderpass.cpp
index b8d6c2991a0..b8d6c2991a0 100644
--- a/src/libs/timeline/timelineselectionrenderpass.cpp
+++ b/src/libs/tracing/timelineselectionrenderpass.cpp
diff --git a/src/libs/timeline/timelineselectionrenderpass.h b/src/libs/tracing/timelineselectionrenderpass.h
index 85ac511d6a6..1a65ab3e451 100644
--- a/src/libs/timeline/timelineselectionrenderpass.h
+++ b/src/libs/tracing/timelineselectionrenderpass.h
@@ -31,7 +31,7 @@
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineSelectionRenderPass : public TimelineRenderPass
+class TRACING_EXPORT TimelineSelectionRenderPass : public TimelineRenderPass
 {
 public:
     static const TimelineSelectionRenderPass *instance();
diff --git a/src/libs/timeline/timelinetheme.cpp b/src/libs/tracing/timelinetheme.cpp
index a78509d786a..22d8697b782 100644
--- a/src/libs/timeline/timelinetheme.cpp
+++ b/src/libs/tracing/timelinetheme.cpp
@@ -67,23 +67,23 @@ public:
         else if (iconName == QLatin1String("zoom"))
             icon = Utils::Icons::ZOOM_TOOLBAR;
         else if (iconName == QLatin1String("rangeselection"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/ico_rangeselection.png"),
+            icon = Utils::Icon({{QLatin1String(":/tracing/ico_rangeselection.png"),
                                  Utils::Theme::IconsBaseColor}});
         else if (iconName == QLatin1String("rangeselected"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/ico_rangeselected.png"),
+            icon = Utils::Icon({{QLatin1String(":/tracing/ico_rangeselected.png"),
                                  Utils::Theme::IconsBaseColor}});
         else if (iconName == QLatin1String("selectionmode"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/ico_selectionmode.png"),
+            icon = Utils::Icon({{QLatin1String(":/tracing/ico_selectionmode.png"),
                                  Utils::Theme::IconsBaseColor}});
         else if (iconName == QLatin1String("edit"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/ico_edit.png"),
+            icon = Utils::Icon({{QLatin1String(":/tracing/ico_edit.png"),
                                  Utils::Theme::IconsBaseColor}});
         else if (iconName == QLatin1String("lock_open"))
             icon = Utils::Icons::UNLOCKED_TOOLBAR;
         else if (iconName == QLatin1String("lock_closed"))
             icon = Utils::Icons::LOCKED_TOOLBAR;
         else if (iconName == QLatin1String("range_handle"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/range_handle.png"),
+            icon = Utils::Icon({{QLatin1String(":/tracing/range_handle.png"),
                                  Utils::Theme::IconsBaseColor}});
         else if (iconName == QLatin1String("note"))
             icon = Utils::Icons::INFO_TOOLBAR;
diff --git a/src/libs/timeline/timelinetheme.h b/src/libs/tracing/timelinetheme.h
index 24412b757ac..059bfabad70 100644
--- a/src/libs/timeline/timelinetheme.h
+++ b/src/libs/tracing/timelinetheme.h
@@ -25,13 +25,13 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 
 QT_FORWARD_DECLARE_CLASS(QQmlEngine)
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineTheme {
+class TRACING_EXPORT TimelineTheme {
 public:
     static void setupTheme(QQmlEngine* engine);
 };
diff --git a/src/libs/timeline/timelinetracefile.cpp b/src/libs/tracing/timelinetracefile.cpp
index 45fc4bbbe17..45fc4bbbe17 100644
--- a/src/libs/timeline/timelinetracefile.cpp
+++ b/src/libs/tracing/timelinetracefile.cpp
diff --git a/src/libs/timeline/timelinetracefile.h b/src/libs/tracing/timelinetracefile.h
index 950b9f21d78..799cd6bab97 100644
--- a/src/libs/timeline/timelinetracefile.h
+++ b/src/libs/tracing/timelinetracefile.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 
 #include <QFutureInterface>
 #include <QObject>
@@ -37,7 +37,7 @@ namespace Timeline {
 class TimelineNotesModel;
 class TimelineTraceManager;
 
-class TIMELINE_EXPORT TimelineTraceFile : public QObject
+class TRACING_EXPORT TimelineTraceFile : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/libs/timeline/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp
index 5a81d5a1f64..5a81d5a1f64 100644
--- a/src/libs/timeline/timelinetracemanager.cpp
+++ b/src/libs/tracing/timelinetracemanager.cpp
diff --git a/src/libs/timeline/timelinetracemanager.h b/src/libs/tracing/timelinetracemanager.h
index fa5cffba972..ddba03f6f74 100644
--- a/src/libs/timeline/timelinetracemanager.h
+++ b/src/libs/tracing/timelinetracemanager.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 #include "timelinenotesmodel.h"
 #include "traceevent.h"
 #include "traceeventtype.h"
@@ -38,7 +38,7 @@
 namespace Timeline {
 
 class TimelineTraceFile;
-class TIMELINE_EXPORT TimelineTraceManager : public QObject
+class TRACING_EXPORT TimelineTraceManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/libs/timeline/timelinezoomcontrol.cpp b/src/libs/tracing/timelinezoomcontrol.cpp
index 973a88624e5..973a88624e5 100644
--- a/src/libs/timeline/timelinezoomcontrol.cpp
+++ b/src/libs/tracing/timelinezoomcontrol.cpp
diff --git a/src/libs/timeline/timelinezoomcontrol.h b/src/libs/tracing/timelinezoomcontrol.h
index 5c6cc719cff..68300b84388 100644
--- a/src/libs/timeline/timelinezoomcontrol.h
+++ b/src/libs/tracing/timelinezoomcontrol.h
@@ -25,12 +25,12 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 #include <QTimer>
 
 namespace Timeline {
 
-class TIMELINE_EXPORT TimelineZoomControl : public QObject {
+class TRACING_EXPORT TimelineZoomControl : public QObject {
     Q_OBJECT
 
     Q_PROPERTY(qint64 traceStart READ traceStart NOTIFY traceChanged)
diff --git a/src/libs/timeline/traceevent.h b/src/libs/tracing/traceevent.h
index 73985fc85f7..f80ba232bbc 100644
--- a/src/libs/timeline/traceevent.h
+++ b/src/libs/tracing/traceevent.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 
 #include <QHash>
 #include <QMetaType>
diff --git a/src/libs/timeline/traceeventtype.h b/src/libs/tracing/traceeventtype.h
index ea3d4fc5a31..119b5dfa9cd 100644
--- a/src/libs/timeline/traceeventtype.h
+++ b/src/libs/tracing/traceeventtype.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "timeline_global.h"
+#include "tracing_global.h"
 
 #include <QHash>
 #include <QMetaType>
diff --git a/src/libs/timeline/tracestashfile.h b/src/libs/tracing/tracestashfile.h
index d860ece9221..d860ece9221 100644
--- a/src/libs/timeline/tracestashfile.h
+++ b/src/libs/tracing/tracestashfile.h
diff --git a/src/libs/timeline/timeline.pro b/src/libs/tracing/tracing.pro
index aa8a1e1e34b..1ef079a20bd 100644
--- a/src/libs/timeline/timeline.pro
+++ b/src/libs/tracing/tracing.pro
@@ -1,9 +1,10 @@
 QT += qml quick
-DEFINES += TIMELINE_LIBRARY
+DEFINES += TRACING_LIBRARY
 
 include(../../qtcreatorlibrary.pri)
 
 SOURCES += \
+    $$PWD/flamegraph.cpp \
     $$PWD/timelinemodel.cpp \
     $$PWD/timelinemodelaggregator.cpp \
     $$PWD/timelinerenderer.cpp \
@@ -22,7 +23,9 @@ SOURCES += \
     $$PWD/timelinetracemanager.cpp
 
 HEADERS += \
-    $$PWD/timeline_global.h \
+    $$PWD/flamegraph.h \
+    $$PWD/flamegraphattached.h \
+    $$PWD/tracing_global.h \
     $$PWD/timelinemodel.h \
     $$PWD/timelinemodel_p.h \
     $$PWD/timelinemodelaggregator.h \
@@ -50,7 +53,7 @@ HEADERS += \
     $$PWD/tracestashfile.h
 
 RESOURCES += \
-    $$PWD/qml/timeline.qrc
+    $$PWD/qml/tracing.qrc
 
 DISTFILES += README
 
diff --git a/src/libs/timeline/timeline.qbs b/src/libs/tracing/tracing.qbs
index 584197e3f4f..d91c765db00 100644
--- a/src/libs/timeline/timeline.qbs
+++ b/src/libs/tracing/tracing.qbs
@@ -3,7 +3,7 @@ import qbs 1.0
 import QtcLibrary
 
 Project {
-    name: "Timeline"
+    name: "Tracing"
 
     QtcDevHeaders { }
 
@@ -15,6 +15,8 @@ Project {
             name: "General"
             files: [
                 "README",
+                "flamegraph.cpp", "flamegraph.h",
+                "flamegraphattached.h",
                 "timelineabstractrenderer.cpp", "timelineabstractrenderer.h",
                 "timelineabstractrenderer_p.h",
                 "timelineformattime.cpp", "timelineformattime.h",
@@ -40,7 +42,7 @@ Project {
         Group {
             name: "QML"
             prefix: "qml/"
-            files: ["timeline.qrc"]
+            files: ["tracing.qrc"]
         }
 
         Group {
@@ -51,6 +53,6 @@ Project {
             ]
         }
 
-        cpp.defines: base.concat("TIMELINE_LIBRARY")
+        cpp.defines: base.concat("TRACING_LIBRARY")
     }
 }
diff --git a/src/libs/timeline/timeline_dependencies.pri b/src/libs/tracing/tracing_dependencies.pri
index 9985a4e1e74..c703652c04b 100644
--- a/src/libs/timeline/timeline_dependencies.pri
+++ b/src/libs/tracing/tracing_dependencies.pri
@@ -1,3 +1,3 @@
-QTC_LIB_NAME = Timeline
+QTC_LIB_NAME = Tracing
 
 QTC_LIB_DEPENDS = utils
diff --git a/src/libs/timeline/timeline_global.h b/src/libs/tracing/tracing_global.h
index 1b2a560fb4f..4ec75d81ee9 100644
--- a/src/libs/timeline/timeline_global.h
+++ b/src/libs/tracing/tracing_global.h
@@ -27,8 +27,8 @@
 
 #include <QtGlobal>
 
-#if defined(TIMELINE_LIBRARY)
-#  define TIMELINE_EXPORT Q_DECL_EXPORT
+#if defined(TRACING_LIBRARY)
+#  define TRACING_EXPORT Q_DECL_EXPORT
 #else
-#  define TIMELINE_EXPORT Q_DECL_IMPORT
+#  define TRACING_EXPORT Q_DECL_IMPORT
 #endif