Change a bunch of includes to forward declarations

Change-Id: I5a03b059a66b6e7c7c9adde26e2ad4506cc21a36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

14 files changed, 51 insertions, 18 deletions

diff --git a/src/lib/corelib/api/rulecommand.h b/src/lib/corelib/api/rulecommand.h
index 54862ec31..172e1ad51 100644
--- a/src/lib/corelib/api/rulecommand.h
+++ b/src/lib/corelib/api/rulecommand.h
@@ -42,11 +42,13 @@
 
 #include <tools/qbs_export.h>
 
+#include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
-#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 class QProcessEnvironment;
+class QString;
+class QStringList;
 QT_END_NAMESPACE
 
 namespace qbs {
diff --git a/src/lib/corelib/api/runenvironment.h b/src/lib/corelib/api/runenvironment.h
index 671fc6130..5c380d48c 100644
--- a/src/lib/corelib/api/runenvironment.h
+++ b/src/lib/corelib/api/runenvironment.h
@@ -43,10 +43,12 @@
 #include <language/forward_decls.h>
 #include <tools/qbs_export.h>
 
-#include <QtCore/qstringlist.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 class QProcessEnvironment;
+class QString;
+class QStringList;
 QT_END_NAMESPACE
 
 namespace qbs {
diff --git a/src/lib/corelib/tools/buildoptions.h b/src/lib/corelib/tools/buildoptions.h
index 1a0ac70dc..630a6aa22 100644
--- a/src/lib/corelib/tools/buildoptions.h
+++ b/src/lib/corelib/tools/buildoptions.h
@@ -44,7 +44,10 @@
 #include "commandechomode.h"
 
 #include <QtCore/qshareddata.h>
-#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+class QStringList;
+QT_END_NAMESPACE
 
 namespace qbs {
 namespace Internal { class BuildOptionsPrivate; }
diff --git a/src/lib/corelib/tools/cleanoptions.h b/src/lib/corelib/tools/cleanoptions.h
index a2f22c3d3..5746b0f18 100644
--- a/src/lib/corelib/tools/cleanoptions.h
+++ b/src/lib/corelib/tools/cleanoptions.h
@@ -42,7 +42,6 @@
 #include "qbs_export.h"
 
 #include <QtCore/qshareddata.h>
-#include <QtCore/qstring.h>
 
 namespace qbs {
 namespace Internal { class CleanOptionsPrivate; }
diff --git a/src/lib/corelib/tools/commandechomode.cpp b/src/lib/corelib/tools/commandechomode.cpp
index fc6a3386a..52c619637 100644
--- a/src/lib/corelib/tools/commandechomode.cpp
+++ b/src/lib/corelib/tools/commandechomode.cpp
@@ -40,6 +40,9 @@
 
 #include "commandechomode.h"
 
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
+
 /*!
  * \enum CommandEchoMode
  * This enum type specifies the kind of output to display when executing commands.
diff --git a/src/lib/corelib/tools/commandechomode.h b/src/lib/corelib/tools/commandechomode.h
index 8a7852211..88d8377ad 100644
--- a/src/lib/corelib/tools/commandechomode.h
+++ b/src/lib/corelib/tools/commandechomode.h
@@ -42,8 +42,12 @@
 #define QBS_COMMANDECHOMODE_H
 
 #include "qbs_export.h"
-#include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+class QString;
+class QStringList;
+QT_END_NAMESPACE
 
 namespace qbs {
 
diff --git a/src/lib/corelib/tools/error.h b/src/lib/corelib/tools/error.h
index 51d9f3455..4832499af 100644
--- a/src/lib/corelib/tools/error.h
+++ b/src/lib/corelib/tools/error.h
@@ -42,12 +42,15 @@
 
 #include "codelocation.h"
 
-#include <QtCore/qshareddata.h>
 #include <QtCore/qhash.h>
-#include <QtCore/qlist.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
-#include <QtCore/qstring.h>
+
+QT_BEGIN_NAMESPACE
+template <class T> class QList;
+class QString;
+class QStringList;
+QT_END_NAMESPACE
 
 namespace qbs {
 namespace Internal { class PersistentPool; }
diff --git a/src/lib/corelib/tools/installoptions.h b/src/lib/corelib/tools/installoptions.h
index 0053e1248..7b621cb1b 100644
--- a/src/lib/corelib/tools/installoptions.h
+++ b/src/lib/corelib/tools/installoptions.h
@@ -42,7 +42,10 @@
 #include "qbs_export.h"
 
 #include <QtCore/qshareddata.h>
-#include <QtCore/qstring.h>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
 
 namespace qbs {
 class InstallOptions;
diff --git a/src/lib/corelib/tools/processresult.h b/src/lib/corelib/tools/processresult.h
index 0db1fe2bf..2d2ebbfb4 100644
--- a/src/lib/corelib/tools/processresult.h
+++ b/src/lib/corelib/tools/processresult.h
@@ -44,8 +44,11 @@
 #include <QtCore/qshareddata.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qprocess.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+class QString;
+class QStringList;
+QT_END_NAMESPACE
 
 namespace qbs {
 namespace Internal {
diff --git a/src/lib/corelib/tools/profile.h b/src/lib/corelib/tools/profile.h
index 4dd78c0ca..a4c6a91f1 100644
--- a/src/lib/corelib/tools/profile.h
+++ b/src/lib/corelib/tools/profile.h
@@ -42,9 +42,12 @@
 #include "qbs_export.h"
 
 #include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
 
+QT_BEGIN_NAMESPACE
+class QStringList;
+QT_END_NAMESPACE
+
 namespace qbs {
 class ErrorInfo;
 class Settings;
diff --git a/src/lib/corelib/tools/projectgeneratormanager.h b/src/lib/corelib/tools/projectgeneratormanager.h
index d9f997fa7..17270c004 100644
--- a/src/lib/corelib/tools/projectgeneratormanager.h
+++ b/src/lib/corelib/tools/projectgeneratormanager.h
@@ -46,7 +46,10 @@
 
 #include <QtCore/qmap.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+class QStringList;
+QT_END_NAMESPACE
 
 namespace qbs {
 class ProjectGenerator;
diff --git a/src/lib/corelib/tools/settings.h b/src/lib/corelib/tools/settings.h
index 2e11e903d..cd6e664a3 100644
--- a/src/lib/corelib/tools/settings.h
+++ b/src/lib/corelib/tools/settings.h
@@ -42,11 +42,12 @@
 
 #include "qbs_export.h"
 
-#include <QtCore/qstringlist.h>
+#include <QtCore/qstring.h>
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
+class QStringList;
 QT_END_NAMESPACE
 
 namespace qbs {
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index ce443c790..91bf311da 100644
--- a/src/lib/corelib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
@@ -49,6 +49,7 @@
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
+#include <QtCore/qprocess.h>
 
 namespace qbs {
 namespace Internal {
diff --git a/src/lib/corelib/tools/setupprojectparameters.h b/src/lib/corelib/tools/setupprojectparameters.h
index 207aa9000..fd73d0748 100644
--- a/src/lib/corelib/tools/setupprojectparameters.h
+++ b/src/lib/corelib/tools/setupprojectparameters.h
@@ -43,10 +43,13 @@
 
 #include <tools/error.h>
 
-#include <QtCore/qprocess.h>
 #include <QtCore/qshareddata.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qvariant.h>
+
+QT_BEGIN_NAMESPACE
+class QProcessEnvironment;
+class QStringList;
+typedef QMap<QString, QVariant> QVariantMap;
+QT_END_NAMESPACE
 
 namespace qbs {