summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-03-23 14:28:39 +0100
committerhjk <hjk@qt.io>2023-03-28 13:07:07 +0000
commit5cfc52a92c5858e90c650e74c2d84df6705e37a0 (patch)
tree1370cd481d22278b5e785e697385a52538201cb7
parentbc4629d427d5bec02e8a87bd7b2b0db11916b050 (diff)
downloadqt-creator-5cfc52a92c5858e90c650e74c2d84df6705e37a0.tar.gz
Android/Baremetal: Clean up some header
Change-Id: I63a3483a28d9a4ccd21042ae3bd2049598125f5f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--src/plugins/android/androidplugin.cpp2
-rw-r--r--src/plugins/android/androidruncontrol.h6
-rw-r--r--src/plugins/baremetal/baremetaldebugsupport.cpp1
-rw-r--r--src/plugins/baremetal/baremetaldebugsupport.h5
-rw-r--r--src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp2
-rw-r--r--src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp1
6 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 0eeb890f82..04e9609b85 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -50,6 +50,8 @@
#include <qtsupport/qtversionmanager.h>
+#include <QTimer>
+
using namespace ProjectExplorer;
using namespace ProjectExplorer::Constants;
diff --git a/src/plugins/android/androidruncontrol.h b/src/plugins/android/androidruncontrol.h
index a466de7226..f96c19443b 100644
--- a/src/plugins/android/androidruncontrol.h
+++ b/src/plugins/android/androidruncontrol.h
@@ -3,14 +3,10 @@
#pragma once
-#include "androidrunner.h"
-
-#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/runcontrol.h>
namespace Android::Internal {
-class AndroidRunner;
-
class AndroidRunWorkerFactory final : public ProjectExplorer::RunWorkerFactory
{
public:
diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp
index db0c376a5a..c236ab32f2 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.cpp
+++ b/src/plugins/baremetal/baremetaldebugsupport.cpp
@@ -11,6 +11,7 @@
#include "idebugserverprovider.h"
#include <debugger/debuggerkitinformation.h>
+#include <debugger/debuggerruncontrol.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsteplist.h>
diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h
index f0addb4729..ca16c1ab7e 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.h
+++ b/src/plugins/baremetal/baremetaldebugsupport.h
@@ -3,12 +3,11 @@
#pragma once
-#include <debugger/debuggerruncontrol.h>
+#include <projectexplorer/runcontrol.h>
namespace BareMetal::Internal {
-class BareMetalDebugSupportFactory final
- : public ProjectExplorer::RunWorkerFactory
+class BareMetalDebugSupportFactory final : public ProjectExplorer::RunWorkerFactory
{
public:
BareMetalDebugSupportFactory();
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index 336b606d79..222d22ade9 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -8,6 +8,8 @@
#include <baremetal/baremetaltr.h>
#include <baremetal/debugserverprovidermanager.h>
+#include <debugger/debuggerruncontrol.h>
+
#include <projectexplorer/runconfigurationaspects.h>
#include <utils/environment.h>
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index b95c333600..590c115886 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -14,6 +14,7 @@
#include <baremetal/debugserverprovidermanager.h>
#include <debugger/debuggerkitinformation.h>
+#include <debugger/debuggerruncontrol.h>
#include <projectexplorer/project.h>
#include <projectexplorer/runconfigurationaspects.h>