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>

46 files changed, 94 insertions, 90 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 2a9abfc538b..b1498d40d2f 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -26,4 +26,4 @@ SUBDIRS += \
     valgrind
 
 qtHaveModule(qml): SUBDIRS += qml
-qtHaveModule(quick): SUBDIRS += flamegraph timeline
+qtHaveModule(quick): SUBDIRS += tracing
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
index a61bacaa5cd..03bfeebc86c 100644
--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -15,7 +15,6 @@ Project {
         "extensionsystem/extensionsystem.qbs",
         "externaltool/externaltool.qbs",
         "filesearch/filesearch.qbs",
-        "flamegraph/flamegraph.qbs",
         "generichighlighter/generichighlighter.qbs",
         "json/json.qbs",
         "profilewriter/profilewriter.qbs",
@@ -23,7 +22,7 @@ Project {
         "qtcprocess/qtcprocess.qbs",
         "runextensions/runextensions.qbs",
         "sdktool/sdktool.qbs",
-        "timeline/timeline.qbs",
+        "tracing/tracing.qbs",
         "treeviewfind/treeviewfind.qbs",
         "toolchaincache/toolchaincache.qbs",
         "utils/utils.qbs",
diff --git a/tests/auto/flamegraph/flamegraph.pro b/tests/auto/flamegraph/flamegraph.pro
deleted file mode 100644
index 6ea151f4c92..00000000000
--- a/tests/auto/flamegraph/flamegraph.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-QTC_LIB_DEPENDS += flamegraph
-include(../qttest.pri)
-
-QT += quick
-SOURCES += tst_flamegraph.cpp
diff --git a/tests/auto/flamegraph/flamegraph.qbs b/tests/auto/flamegraph/flamegraph.qbs
deleted file mode 100644
index de00698243b..00000000000
--- a/tests/auto/flamegraph/flamegraph.qbs
+++ /dev/null
@@ -1,9 +0,0 @@
-import qbs
-
-QtcAutotest {
-    name: "FlameGraph autotest"
-    Depends { name: "FlameGraph" }
-    Depends { name: "Qt.quick" }
-    Depends { name: "Qt.gui" }
-    files: "tst_flamegraph.cpp"
-}
diff --git a/tests/auto/tracing/flamegraph/flamegraph.pro b/tests/auto/tracing/flamegraph/flamegraph.pro
new file mode 100644
index 00000000000..b668b987d10
--- /dev/null
+++ b/tests/auto/tracing/flamegraph/flamegraph.pro
@@ -0,0 +1,7 @@
+QT += quick
+
+QTC_LIB_DEPENDS += tracing
+include(../../qttest.pri)
+
+SOURCES += \
+    tst_flamegraph.cpp
diff --git a/tests/auto/tracing/flamegraph/flamegraph.qbs b/tests/auto/tracing/flamegraph/flamegraph.qbs
new file mode 100644
index 00000000000..7323dd7fb73
--- /dev/null
+++ b/tests/auto/tracing/flamegraph/flamegraph.qbs
@@ -0,0 +1,12 @@
+import qbs
+import "../tracingautotest.qbs" as TracingAutotest
+
+TracingAutotest {
+    name: "FlameGraph autotest"
+    Group {
+        name: "Test sources"
+        files: [
+            "tst_flamegraph.cpp"
+        ]
+    }
+}
diff --git a/tests/auto/flamegraph/tst_flamegraph.cpp b/tests/auto/tracing/flamegraph/tst_flamegraph.cpp
index 4e249887b22..e8335e034c1 100644
--- a/tests/auto/flamegraph/tst_flamegraph.cpp
+++ b/tests/auto/tracing/flamegraph/tst_flamegraph.cpp
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#include <flamegraph/flamegraph.h>
-#include <flamegraph/flamegraphattached.h>
+#include <tracing/flamegraph.h>
+#include <tracing/flamegraphattached.h>
 #include <QObject>
 #include <QStandardItemModel>
 #include <QQmlComponent>
diff --git a/tests/auto/timeline/timelineabstractrenderer/timelineabstractrenderer.pro b/tests/auto/tracing/timelineabstractrenderer/timelineabstractrenderer.pro
index 60eea25e903..53038ebfdf7 100644
--- a/tests/auto/timeline/timelineabstractrenderer/timelineabstractrenderer.pro
+++ b/tests/auto/tracing/timelineabstractrenderer/timelineabstractrenderer.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelineabstractrenderer/timelineabstractrenderer.qbs b/tests/auto/tracing/timelineabstractrenderer/timelineabstractrenderer.qbs
index 5eabbb36726..99880dd7c95 100644
--- a/tests/auto/timeline/timelineabstractrenderer/timelineabstractrenderer.qbs
+++ b/tests/auto/tracing/timelineabstractrenderer/timelineabstractrenderer.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineAbstractRenderer autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelineabstractrenderer/tst_timelineabstractrenderer.cpp b/tests/auto/tracing/timelineabstractrenderer/tst_timelineabstractrenderer.cpp
index b2aaab141d0..e4f8e7b69d9 100644
--- a/tests/auto/timeline/timelineabstractrenderer/tst_timelineabstractrenderer.cpp
+++ b/tests/auto/tracing/timelineabstractrenderer/tst_timelineabstractrenderer.cpp
@@ -24,8 +24,8 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelineabstractrenderer_p.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelineabstractrenderer_p.h>
 
 using namespace Timeline;
 
diff --git a/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.pro b/tests/auto/tracing/timelineitemsrenderpass/timelineitemsrenderpass.pro
index 1ac34f8c275..ba375915908 100644
--- a/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.pro
+++ b/tests/auto/tracing/timelineitemsrenderpass/timelineitemsrenderpass.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.qbs b/tests/auto/tracing/timelineitemsrenderpass/timelineitemsrenderpass.qbs
index 3e2eef8e29f..0ba6f6ca64b 100644
--- a/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.qbs
+++ b/tests/auto/tracing/timelineitemsrenderpass/timelineitemsrenderpass.qbs
@@ -1,8 +1,8 @@
 import qbs
 import QtcFunctions
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineItemsRenderPass autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelineitemsrenderpass/tst_timelineitemsrenderpass.cpp b/tests/auto/tracing/timelineitemsrenderpass/tst_timelineitemsrenderpass.cpp
index 6bf7f0d8905..7a987332b82 100644
--- a/tests/auto/timeline/timelineitemsrenderpass/tst_timelineitemsrenderpass.cpp
+++ b/tests/auto/tracing/timelineitemsrenderpass/tst_timelineitemsrenderpass.cpp
@@ -23,10 +23,10 @@
 **
 ****************************************************************************/
 
-#include <timeline/runscenegraphtest.h>
-#include <timeline/timelineitemsrenderpass.h>
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelinerenderstate.h>
+#include <tracing/runscenegraphtest.h>
+#include <tracing/timelineitemsrenderpass.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelinerenderstate.h>
 
 #include <QtTest>
 #include <QSGMaterialShader>
diff --git a/tests/auto/timeline/timelinemodel/timelinemodel.pro b/tests/auto/tracing/timelinemodel/timelinemodel.pro
index a0b56add42c..a14fd3a09f9 100644
--- a/tests/auto/timeline/timelinemodel/timelinemodel.pro
+++ b/tests/auto/tracing/timelinemodel/timelinemodel.pro
@@ -1,4 +1,4 @@
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinemodel/timelinemodel.qbs b/tests/auto/tracing/timelinemodel/timelinemodel.qbs
index f4fc5f7be33..b936a29a14f 100644
--- a/tests/auto/timeline/timelinemodel/timelinemodel.qbs
+++ b/tests/auto/tracing/timelinemodel/timelinemodel.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineModel autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp b/tests/auto/tracing/timelinemodel/tst_timelinemodel.cpp
index 01a00d02567..be527af1273 100644
--- a/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp
+++ b/tests/auto/tracing/timelinemodel/tst_timelinemodel.cpp
@@ -25,8 +25,8 @@
 
 #include <QtTest>
 #include <QColor>
-#include <timeline/timelinemodel_p.h>
-#include <timeline/timelinemodelaggregator.h>
+#include <tracing/timelinemodel_p.h>
+#include <tracing/timelinemodelaggregator.h>
 
 static const int NumItems = 32;
 static const qint64 ItemDuration = 1 << 19;
diff --git a/tests/auto/timeline/timelinemodelaggregator/timelinemodelaggregator.pro b/tests/auto/tracing/timelinemodelaggregator/timelinemodelaggregator.pro
index 61a8a31c28e..8eff246b1b4 100644
--- a/tests/auto/timeline/timelinemodelaggregator/timelinemodelaggregator.pro
+++ b/tests/auto/tracing/timelinemodelaggregator/timelinemodelaggregator.pro
@@ -1,4 +1,4 @@
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinemodelaggregator/timelinemodelaggregator.qbs b/tests/auto/tracing/timelinemodelaggregator/timelinemodelaggregator.qbs
index 2531cf5c2e8..2329ae3ed1e 100644
--- a/tests/auto/timeline/timelinemodelaggregator/timelinemodelaggregator.qbs
+++ b/tests/auto/tracing/timelinemodelaggregator/timelinemodelaggregator.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineModelAggregator autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinemodelaggregator/tst_timelinemodelaggregator.cpp b/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp
index 70ca024f70d..fedd3dfafa8 100644
--- a/tests/auto/timeline/timelinemodelaggregator/tst_timelinemodelaggregator.cpp
+++ b/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include <timeline/timelinemodelaggregator.h>
+#include <tracing/timelinemodelaggregator.h>
 
 class tst_TimelineModelAggregator : public QObject
 {
diff --git a/tests/auto/timeline/timelinenotesmodel/timelinenotesmodel.pro b/tests/auto/tracing/timelinenotesmodel/timelinenotesmodel.pro
index 47e00891ea6..bc7a68e570f 100644
--- a/tests/auto/timeline/timelinenotesmodel/timelinenotesmodel.pro
+++ b/tests/auto/tracing/timelinenotesmodel/timelinenotesmodel.pro
@@ -1,4 +1,4 @@
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinenotesmodel/timelinenotesmodel.qbs b/tests/auto/tracing/timelinenotesmodel/timelinenotesmodel.qbs
index b43cf6486a2..adcacb7d998 100644
--- a/tests/auto/timeline/timelinenotesmodel/timelinenotesmodel.qbs
+++ b/tests/auto/tracing/timelinenotesmodel/timelinenotesmodel.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineNotesModel autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinenotesmodel/tst_timelinenotesmodel.cpp b/tests/auto/tracing/timelinenotesmodel/tst_timelinenotesmodel.cpp
index 125f9ad995e..dd861cb5a9e 100644
--- a/tests/auto/timeline/timelinenotesmodel/tst_timelinenotesmodel.cpp
+++ b/tests/auto/tracing/timelinenotesmodel/tst_timelinenotesmodel.cpp
@@ -25,8 +25,8 @@
 
 #include <QtTest>
 #include <QColor>
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelinenotesmodel.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelinenotesmodel.h>
 
 class tst_TimelineNotesModel : public QObject
 {
diff --git a/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.pro b/tests/auto/tracing/timelinenotesrenderpass/timelinenotesrenderpass.pro
index b1167b02bdf..33c09eb66c2 100644
--- a/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.pro
+++ b/tests/auto/tracing/timelinenotesrenderpass/timelinenotesrenderpass.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.qbs b/tests/auto/tracing/timelinenotesrenderpass/timelinenotesrenderpass.qbs
index 4f3c25e758f..3b0efa5b53f 100644
--- a/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.qbs
+++ b/tests/auto/tracing/timelinenotesrenderpass/timelinenotesrenderpass.qbs
@@ -1,8 +1,8 @@
 import qbs
 import QtcFunctions
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineNotesRenderPass autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinenotesrenderpass/tst_timelinenotesrenderpass.cpp b/tests/auto/tracing/timelinenotesrenderpass/tst_timelinenotesrenderpass.cpp
index 9e238a1e429..f7891b37d78 100644
--- a/tests/auto/timeline/timelinenotesrenderpass/tst_timelinenotesrenderpass.cpp
+++ b/tests/auto/tracing/timelinenotesrenderpass/tst_timelinenotesrenderpass.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include <timeline/runscenegraphtest.h>
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelinenotesrenderpass.h>
-#include <timeline/timelinerenderstate.h>
-#include <timeline/timelineabstractrenderer_p.h>
+#include <tracing/runscenegraphtest.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelinenotesrenderpass.h>
+#include <tracing/timelinerenderstate.h>
+#include <tracing/timelineabstractrenderer_p.h>
 
 #include <QtTest>
 #include <QSGMaterialShader>
diff --git a/tests/auto/timeline/timelineoverviewrenderer/timelineoverviewrenderer.pro b/tests/auto/tracing/timelineoverviewrenderer/timelineoverviewrenderer.pro
index 2e533e63206..55299115904 100644
--- a/tests/auto/timeline/timelineoverviewrenderer/timelineoverviewrenderer.pro
+++ b/tests/auto/tracing/timelineoverviewrenderer/timelineoverviewrenderer.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelineoverviewrenderer/timelineoverviewrenderer.qbs b/tests/auto/tracing/timelineoverviewrenderer/timelineoverviewrenderer.qbs
index d2cc5b0c124..2144dba1f99 100644
--- a/tests/auto/timeline/timelineoverviewrenderer/timelineoverviewrenderer.qbs
+++ b/tests/auto/tracing/timelineoverviewrenderer/timelineoverviewrenderer.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineOverviewRenderer autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp b/tests/auto/tracing/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp
index 97371c4de62..0dfed3eec85 100644
--- a/tests/auto/timeline/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp
+++ b/tests/auto/tracing/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp
@@ -24,8 +24,8 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelineoverviewrenderer_p.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelineoverviewrenderer_p.h>
 
 using namespace Timeline;
 
diff --git a/tests/auto/timeline/timelinerenderer/timelinerenderer.pro b/tests/auto/tracing/timelinerenderer/timelinerenderer.pro
index 8d3fa6a17b8..1c49cfdfbf1 100644
--- a/tests/auto/timeline/timelinerenderer/timelinerenderer.pro
+++ b/tests/auto/tracing/timelinerenderer/timelinerenderer.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinerenderer/timelinerenderer.qbs b/tests/auto/tracing/timelinerenderer/timelinerenderer.qbs
index 0ae1434193b..45a97acc6d4 100644
--- a/tests/auto/timeline/timelinerenderer/timelinerenderer.qbs
+++ b/tests/auto/tracing/timelinerenderer/timelinerenderer.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineRenderer autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp b/tests/auto/tracing/timelinerenderer/tst_timelinerenderer.cpp
index a18886b551a..5378df44675 100644
--- a/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp
+++ b/tests/auto/tracing/timelinerenderer/tst_timelinerenderer.cpp
@@ -24,8 +24,8 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelinerenderer_p.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelinerenderer_p.h>
 
 using namespace Timeline;
 
diff --git a/tests/auto/timeline/timelinerenderpass/timelinerenderpass.pro b/tests/auto/tracing/timelinerenderpass/timelinerenderpass.pro
index 3e2971c23e3..2bf096ae0b6 100644
--- a/tests/auto/timeline/timelinerenderpass/timelinerenderpass.pro
+++ b/tests/auto/tracing/timelinerenderpass/timelinerenderpass.pro
@@ -1,4 +1,4 @@
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinerenderpass/timelinerenderpass.qbs b/tests/auto/tracing/timelinerenderpass/timelinerenderpass.qbs
index c5628578f07..b2bc54fec25 100644
--- a/tests/auto/timeline/timelinerenderpass/timelinerenderpass.qbs
+++ b/tests/auto/tracing/timelinerenderpass/timelinerenderpass.qbs
@@ -1,8 +1,8 @@
 import qbs
 import QtcFunctions
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineRenderPass autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinerenderpass/tst_timelinerenderpass.cpp b/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
index 2eec7bbefda..cfff804e52f 100644
--- a/tests/auto/timeline/timelinerenderpass/tst_timelinerenderpass.cpp
+++ b/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include <timeline/timelinerenderpass.h>
+#include <tracing/timelinerenderpass.h>
 #include <QtTest>
 
 using namespace Timeline;
diff --git a/tests/auto/timeline/timelinerenderstate/timelinerenderstate.pro b/tests/auto/tracing/timelinerenderstate/timelinerenderstate.pro
index d08588fc91a..b6ccbd07273 100644
--- a/tests/auto/timeline/timelinerenderstate/timelinerenderstate.pro
+++ b/tests/auto/tracing/timelinerenderstate/timelinerenderstate.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinerenderstate/timelinerenderstate.qbs b/tests/auto/tracing/timelinerenderstate/timelinerenderstate.qbs
index d560ac30cfa..b35b97e296b 100644
--- a/tests/auto/timeline/timelinerenderstate/timelinerenderstate.qbs
+++ b/tests/auto/tracing/timelinerenderstate/timelinerenderstate.qbs
@@ -1,8 +1,8 @@
 import qbs
 import QtcFunctions
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineRenderState autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinerenderstate/tst_timelinerenderstate.cpp b/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp
index 6c033a19165..08329bb69af 100644
--- a/tests/auto/timeline/timelinerenderstate/tst_timelinerenderstate.cpp
+++ b/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#include <timeline/timelinemodelaggregator.h>
-#include <timeline/timelinerenderstate.h>
+#include <tracing/timelinemodelaggregator.h>
+#include <tracing/timelinerenderstate.h>
 #include <QtTest>
 #include <QSGSimpleRectNode>
 
diff --git a/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.pro b/tests/auto/tracing/timelineselectionrenderpass/timelineselectionrenderpass.pro
index ad90b6d0aec..77f723bc1c5 100644
--- a/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.pro
+++ b/tests/auto/tracing/timelineselectionrenderpass/timelineselectionrenderpass.pro
@@ -1,6 +1,6 @@
 QT += quick
 
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.qbs b/tests/auto/tracing/timelineselectionrenderpass/timelineselectionrenderpass.qbs
index d600da3b2ca..0cdf08d0c04 100644
--- a/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.qbs
+++ b/tests/auto/tracing/timelineselectionrenderpass/timelineselectionrenderpass.qbs
@@ -1,8 +1,8 @@
 import qbs
 import QtcFunctions
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineSelectionRenderPass autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelineselectionrenderpass/tst_timelineselectionrenderpass.cpp b/tests/auto/tracing/timelineselectionrenderpass/tst_timelineselectionrenderpass.cpp
index 85192bffe4c..2456ab6674a 100644
--- a/tests/auto/timeline/timelineselectionrenderpass/tst_timelineselectionrenderpass.cpp
+++ b/tests/auto/tracing/timelineselectionrenderpass/tst_timelineselectionrenderpass.cpp
@@ -23,12 +23,12 @@
 **
 ****************************************************************************/
 
-#include <timeline/runscenegraphtest.h>
-#include <timeline/timelineselectionrenderpass.h>
-#include <timeline/timelinerenderstate.h>
-#include <timeline/timelineabstractrenderer_p.h>
-#include <timeline/timelineitemsrenderpass.h>
-#include <timeline/timelinemodelaggregator.h>
+#include <tracing/runscenegraphtest.h>
+#include <tracing/timelineselectionrenderpass.h>
+#include <tracing/timelinerenderstate.h>
+#include <tracing/timelineabstractrenderer_p.h>
+#include <tracing/timelineitemsrenderpass.h>
+#include <tracing/timelinemodelaggregator.h>
 
 #include <QtTest>
 #include <QSGMaterialShader>
diff --git a/tests/auto/timeline/timelinezoomcontrol/timelinezoomcontrol.pro b/tests/auto/tracing/timelinezoomcontrol/timelinezoomcontrol.pro
index 90a4c202395..8923467c49e 100644
--- a/tests/auto/timeline/timelinezoomcontrol/timelinezoomcontrol.pro
+++ b/tests/auto/tracing/timelinezoomcontrol/timelinezoomcontrol.pro
@@ -1,4 +1,4 @@
-QTC_LIB_DEPENDS += timeline
+QTC_LIB_DEPENDS += tracing
 include(../../qttest.pri)
 
 SOURCES += \
diff --git a/tests/auto/timeline/timelinezoomcontrol/timelinezoomcontrol.qbs b/tests/auto/tracing/timelinezoomcontrol/timelinezoomcontrol.qbs
index 6f189d16b92..5981e1cb9ad 100644
--- a/tests/auto/timeline/timelinezoomcontrol/timelinezoomcontrol.qbs
+++ b/tests/auto/tracing/timelinezoomcontrol/timelinezoomcontrol.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../timelineautotest.qbs" as TimelineAutotest
+import "../tracingautotest.qbs" as TracingAutotest
 
-TimelineAutotest {
+TracingAutotest {
     name: "TimelineZoomcontrol autotest"
     Group {
         name: "Test sources"
diff --git a/tests/auto/timeline/timelinezoomcontrol/tst_timelinezoomcontrol.cpp b/tests/auto/tracing/timelinezoomcontrol/tst_timelinezoomcontrol.cpp
index 9f35da6ada3..e57763cf66d 100644
--- a/tests/auto/timeline/timelinezoomcontrol/tst_timelinezoomcontrol.cpp
+++ b/tests/auto/tracing/timelinezoomcontrol/tst_timelinezoomcontrol.cpp
@@ -25,7 +25,7 @@
 
 #include <QtTest>
 #include <QColor>
-#include <timeline/timelinezoomcontrol.h>
+#include <tracing/timelinezoomcontrol.h>
 
 class tst_TimelineZoomControl : public QObject
 {
diff --git a/tests/auto/timeline/timeline.pro b/tests/auto/tracing/tracing.pro
index 9a4821612ab..7772d6ec6b6 100644
--- a/tests/auto/timeline/timeline.pro
+++ b/tests/auto/tracing/tracing.pro
@@ -2,6 +2,7 @@ include(../../../qtcreator.pri)
 TEMPLATE = subdirs
 
 SUBDIRS = \
+    flamegraph \
     timelineabstractrenderer \
     timelineitemsrenderpass \
     timelinemodel \
@@ -16,4 +17,4 @@ SUBDIRS = \
     timelinezoomcontrol
 
 OTHER_FILES += \
-    timelineautotest.qbs
+    tracingautotest.qbs
diff --git a/tests/auto/timeline/timeline.qbs b/tests/auto/tracing/tracing.qbs
index 27cf27bc79f..643d25f31ab 100644
--- a/tests/auto/timeline/timeline.qbs
+++ b/tests/auto/tracing/tracing.qbs
@@ -1,11 +1,10 @@
 import qbs
 
 Project {
-    name: "Timeline autotests"
+    name: "Tracing autotests"
 
-    property path timelineDir: project.ide_source_tree
-            + "/src/libs/timeline"
     references: [
+        "flamegraph/flamegraph.qbs",
         "timelinemodel/timelinemodel.qbs",
         "timelinemodelaggregator/timelinemodelaggregator.qbs",
         "timelinenotesmodel/timelinenotesmodel.qbs",
diff --git a/tests/auto/timeline/timelineautotest.qbs b/tests/auto/tracing/tracingautotest.qbs
index 33ae595cbd2..3a6f47961fd 100644
--- a/tests/auto/timeline/timelineautotest.qbs
+++ b/tests/auto/tracing/tracingautotest.qbs
@@ -1,7 +1,7 @@
 import qbs
 
 QtcAutotest {
-    Depends { name: "Timeline" }
+    Depends { name: "Tracing" }
     Depends { name: "Qt.quick" }
     Depends { name: "Qt.gui" }
 }