Merge remote-tracking branch 'origin/8.0'

Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475

src/plugins/qmlprofiler/qmlprofilerplugin.cpp

@@ -28,7 +28,6 @@
 #include "qmlprofilerruncontrol.h"
 #include "qmlprofilersettings.h"
 #include "qmlprofilertool.h"
-#include "qmlprofilertimelinemodel.h"
 #include "qmlprofileractions.h"
 
 #ifdef WITH_TESTS
@@ -65,6 +64,7 @@
 
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/kitinformation.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 

src/plugins/qmlprofiler/qmlprofilertool.cpp

@@ -31,8 +31,6 @@
 #include "qmlprofilerviewmanager.h"
 #include "qmlprofilerclientmanager.h"
 #include "qmlprofilermodelmanager.h"
-#include "qmlprofilerdetailsrewriter.h"
-#include "qmlprofilernotesmodel.h"
 #include "qmlprofilerrunconfigurationaspect.h"
 #include "qmlprofilersettings.h"
 #include "qmlprofilerplugin.h"
@@ -59,8 +57,9 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/taskhub.h>

src/plugins/qmlprofiler/qmlprofilertool.h

@@ -26,8 +26,6 @@
 #pragma once
 
 #include "qmlprofiler_global.h"
-#include "qmlprofilerconstants.h"
-#include "qmlprofilereventtypes.h"
 
 #include <QAction>
 #include <QObject>

src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp

@@ -25,12 +25,15 @@
 
 #include "qmlprofilerviewmanager.h"
 
-#include "qmlprofilertool.h"
+#include "qmlprofilerconstants.h"
 #include "qmlprofilerstatewidget.h"
 
-#include <utils/qtcassert.h>
 #include <debugger/analyzer/analyzermanager.h>
 
+#include <projectexplorer/projectexplorerconstants.h>
+
+#include <utils/qtcassert.h>
+
 #include <QDockWidget>
 
 using namespace Debugger;
@@ -51,7 +54,7 @@ QmlProfilerViewManager::QmlProfilerViewManager(QObject *parent,
     QTC_ASSERT(m_profilerModelManager, return);
     QTC_ASSERT(m_profilerState, return);
 
-    m_perspective = new Utils::Perspective(Constants::QmlProfilerPerspectiveId, tr("QML Profiler"));
+    m_perspective = new Perspective(Constants::QmlProfilerPerspectiveId, tr("QML Profiler"));
     m_perspective->setAboutToActivateCallback([this]() { createViews(); });
 }
 

src/plugins/qmlprofiler/qmlprofilerviewmanager.h

@@ -29,15 +29,11 @@
 #include "qmlprofilertraceview.h"
 #include "flamegraphview.h"
 
-#include <QObject>
-
 namespace Utils { class Perspective; }
 
 namespace QmlProfiler {
 namespace Internal {
 
-class QmlProfilerTool;
-
 class QmlProfilerViewManager : public QObject
 {
     Q_OBJECT

src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp

@@ -27,6 +27,8 @@
 
 #include <debugger/analyzer/analyzermanager.h>
 
+#include <projectexplorer/projectexplorerconstants.h>
+
 #include <qmlprofiler/qmlprofilerruncontrol.h>
 #include <qmlprofiler/qmlprofilertool.h>
 

src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.h

@@ -28,14 +28,13 @@
 #include <qmlprofiler/qmlprofilermodelmanager.h>
 #include <qmlprofiler/qmlprofilerruncontrol.h>
 
-#include <QUrl>
-
 namespace QmlProfiler {
 namespace Internal {
 
 class LocalQmlProfilerRunnerTest : public QObject
 {
     Q_OBJECT
+
 public:
     LocalQmlProfilerRunnerTest(QObject *parent = nullptr);