From dbcf8f4e42feaba11c992992109e18547f01dc98 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 27 Mar 2013 09:15:01 +0100
Subject: [PATCH] QtSupport: Forward-declare some classes.

Change-Id: I7f0eb6c4ea8620c8405f6d13c554c0ec913edd63
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/android/androidruncontrol.cpp        | 2 ++
 src/plugins/madde/maemoqtversion.h               | 1 +
 src/plugins/qbsprojectmanager/qbsbuildstep.h     | 1 +
 src/plugins/qbsprojectmanager/qbscleanstep.h     | 1 +
 src/plugins/qbsprojectmanager/qbsproject.cpp     | 1 +
 src/plugins/qbsprojectmanager/qbsstep.h          | 1 +
 src/plugins/qt4projectmanager/winceqtversion.cpp | 1 +
 src/plugins/qtsupport/baseqtversion.cpp          | 2 ++
 src/plugins/qtsupport/baseqtversion.h            | 4 ++--
 src/plugins/qtsupport/qtversionfactory.cpp       | 1 +
 src/plugins/qtsupport/qtversionfactory.h         | 3 ++-
 src/plugins/qtsupport/qtversionmanager.cpp       | 1 +
 src/plugins/qtsupport/qtversionmanager.h         | 4 ++--
 13 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp
index aa9e07cc4e6..e14e9a70d41 100644
--- a/src/plugins/android/androidruncontrol.cpp
+++ b/src/plugins/android/androidruncontrol.cpp
@@ -36,6 +36,8 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <QIcon>
+
 using namespace ProjectExplorer;
 
 namespace Android {
diff --git a/src/plugins/madde/maemoqtversion.h b/src/plugins/madde/maemoqtversion.h
index 9b259df5fcc..3f38e43be12 100644
--- a/src/plugins/madde/maemoqtversion.h
+++ b/src/plugins/madde/maemoqtversion.h
@@ -30,6 +30,7 @@
 #define MAEMOQTVERSION_H
 
 #include <qtsupport/baseqtversion.h>
+#include <coreplugin/id.h>
 
 namespace Madde {
 namespace Internal {
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index 5fc1a565fc7..62406f99444 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -33,6 +33,7 @@
 #include "qbsbuildconfiguration.h"
 
 #include <projectexplorer/buildstep.h>
+#include <projectexplorer/task.h>
 
 #include <qbs.h>
 
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h
index 57c9b138b78..ff47043f5be 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.h
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -33,6 +33,7 @@
 #include "qbsbuildconfiguration.h"
 
 #include <projectexplorer/buildstep.h>
+#include <projectexplorer/task.h>
 
 #include <qbs.h>
 
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index e97685f63b8..340e1e2c4f9 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -54,6 +54,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/toolchain.h>
+#include <projectexplorer/headerpath.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qmljstools/qmljsmodelmanager.h>
 
diff --git a/src/plugins/qbsprojectmanager/qbsstep.h b/src/plugins/qbsprojectmanager/qbsstep.h
index 167dbd773d4..0a28abcdfd9 100644
--- a/src/plugins/qbsprojectmanager/qbsstep.h
+++ b/src/plugins/qbsprojectmanager/qbsstep.h
@@ -33,6 +33,7 @@
 #include "qbsbuildconfiguration.h"
 
 #include <projectexplorer/buildstep.h>
+#include <projectexplorer/task.h>
 
 #include <qbs.h>
 
diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qt4projectmanager/winceqtversion.cpp
index b75b94857b8..3749392c56e 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.cpp
+++ b/src/plugins/qt4projectmanager/winceqtversion.cpp
@@ -31,6 +31,7 @@
 #include "qt4projectmanagerconstants.h"
 #include <qtsupport/qtsupportconstants.h>
 #include <QCoreApplication>
+#include <QStringList>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index a72bdb5a5cc..d0315491cb2 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -42,6 +42,8 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/headerpath.h>
+#include <projectexplorer/task.h>
 #include <qtsupport/debugginghelper.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <coreplugin/featureprovider.h>
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 2d29e9de077..1a9c483e3a1 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -35,8 +35,6 @@
 #include <utils/fileutils.h>
 
 #include <projectexplorer/abi.h>
-#include <projectexplorer/headerpath.h>
-#include <projectexplorer/task.h>
 
 #include <QVariantMap>
 
@@ -52,6 +50,8 @@ namespace ProjectExplorer {
 class IOutputParser;
 class Kit;
 class ToolChain;
+class HeaderPath;
+class Task;
 } // namespace ProjectExplorer
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp
index eb34c054c87..5a898394424 100644
--- a/src/plugins/qtsupport/qtversionfactory.cpp
+++ b/src/plugins/qtsupport/qtversionfactory.cpp
@@ -34,6 +34,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 
 #include <QSettings>
 
diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h
index bf4329d7f78..83c326e6e86 100644
--- a/src/plugins/qtsupport/qtversionfactory.h
+++ b/src/plugins/qtsupport/qtversionfactory.h
@@ -32,7 +32,6 @@
 
 #include "qtsupport_global.h"
 
-#include <utils/fileutils.h>
 #include <QObject>
 #include <QVariantMap>
 
@@ -41,6 +40,8 @@ class QSettings;
 class ProFileEvaluator;
 QT_END_NAMESPACE
 
+namespace Utils { class FileName; }
+
 namespace QtSupport {
 
 class BaseQtVersion;
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 6ef53b1909a..7e0ce50bdc9 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -62,6 +62,7 @@
 #include <QFile>
 #include <QSettings>
 #include <QTextStream>
+#include <QStringList>
 #include <QTimer>
 
 #include <algorithm>
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index 9542cc1290b..ed87a4f5893 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -33,8 +33,8 @@
 #include "qtsupport_global.h"
 #include "baseqtversion.h"
 
-#include <QSet>
-#include <QStringList>
+QT_FORWARD_DECLARE_CLASS(QStringList)
+QT_FORWARD_DECLARE_CLASS(QTimer)
 
 namespace Utils {
 class FileSystemWatcher;