Clean up [q]fileinfo.h includes

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

12 files changed, 3 insertions, 14 deletions

diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp
index 02985bc16..4c4b4e681 100644
--- a/src/lib/corelib/api/runenvironment.cpp
+++ b/src/lib/corelib/api/runenvironment.cpp
@@ -47,7 +47,6 @@
 #include <logging/logger.h>
 #include <logging/translator.h>
 #include <tools/error.h>
-#include <tools/fileinfo.h>
 #include <tools/hostosinfo.h>
 #include <tools/installoptions.h>
 #include <tools/preferences.h>
diff --git a/src/lib/corelib/buildgraph/artifact.cpp b/src/lib/corelib/buildgraph/artifact.cpp
index c44a1b130..e7c45e6c6 100644
--- a/src/lib/corelib/buildgraph/artifact.cpp
+++ b/src/lib/corelib/buildgraph/artifact.cpp
@@ -44,7 +44,6 @@
 #include "productbuilddata.h"
 #include <language/language.h>
 #include <language/propertymapinternal.h>
-#include <tools/fileinfo.h>
 #include <tools/persistence.h>
 #include <tools/qttools.h>
 
diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index 740303dec..f47c2520a 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -61,7 +61,6 @@
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
-#include <QtCore/qfileinfo.h>
 
 #include <algorithm>
 
diff --git a/src/lib/corelib/buildgraph/rawscanneddependency.cpp b/src/lib/corelib/buildgraph/rawscanneddependency.cpp
index 5839f2f4a..4df39decc 100644
--- a/src/lib/corelib/buildgraph/rawscanneddependency.cpp
+++ b/src/lib/corelib/buildgraph/rawscanneddependency.cpp
@@ -39,6 +39,7 @@
 
 #include "rawscanneddependency.h"
 
+#include <tools/fileinfo.h>
 #include <tools/persistence.h>
 
 namespace qbs {
diff --git a/src/lib/corelib/buildgraph/rawscanneddependency.h b/src/lib/corelib/buildgraph/rawscanneddependency.h
index 738a3294d..ce0cab3b7 100644
--- a/src/lib/corelib/buildgraph/rawscanneddependency.h
+++ b/src/lib/corelib/buildgraph/rawscanneddependency.h
@@ -40,8 +40,6 @@
 #ifndef QBS_RAWSCANNEDDEPENDENCY_H
 #define QBS_RAWSCANNEDDEPENDENCY_H
 
-#include <tools/fileinfo.h>
-
 #include <QString>
 
 namespace qbs {
diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
index 78e5b4b29..cd4df4d01 100644
--- a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
+++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
@@ -45,7 +45,6 @@
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/error.h>
-#include <tools/fileinfo.h>
 #include <tools/progressobserver.h>
 #include <tools/qbsassert.h>
 
diff --git a/src/lib/corelib/jsextensions/environmentextension.cpp b/src/lib/corelib/jsextensions/environmentextension.cpp
index 2986363b6..fcb0411fd 100644
--- a/src/lib/corelib/jsextensions/environmentextension.cpp
+++ b/src/lib/corelib/jsextensions/environmentextension.cpp
@@ -41,10 +41,8 @@
 
 #include <language/scriptengine.h>
 #include <logging/translator.h>
-#include <tools/fileinfo.h>
 
 #include <QtCore/qdir.h>
-#include <QtCore/qfileinfo.h>
 #include <QtCore/qregularexpression.h>
 
 #include <QtScript/qscriptable.h>
diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp
index a31f4b0a3..c2dc06ab1 100644
--- a/src/lib/corelib/jsextensions/utilitiesextension.cpp
+++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp
@@ -42,7 +42,7 @@
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/architectures.h>
-#include <tools/fileinfo.h>
+#include <tools/hostosinfo.h>
 #include <tools/toolchains.h>
 #include <tools/version.h>
 
@@ -57,7 +57,6 @@
 
 #include <QtCore/qcryptographichash.h>
 #include <QtCore/qdir.h>
-#include <QtCore/qfileinfo.h>
 #include <QtCore/qregularexpression.h>
 
 #include <QtScript/qscriptable.h>
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp
index e0261361c..53e309dde 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.cpp
+++ b/src/lib/corelib/language/itemreaderastvisitor.cpp
@@ -53,7 +53,6 @@
 #include <parser/qmljsast_p.h>
 #include <tools/codelocation.h>
 #include <tools/error.h>
-#include <tools/fileinfo.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
 #include <logging/translator.h>
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 778338e77..2ef2e289a 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -43,7 +43,6 @@
 
 #include <logging/translator.h>
 #include <tools/error.h>
-#include <tools/fileinfo.h>
 #include <tools/jsliterals.h>
 #include <tools/profile.h>
 #include <tools/settings.h>
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index ef587cba4..fbc81ecc9 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -30,13 +30,13 @@
 
 #include "../shared.h"
 
-#include <tools/fileinfo.h>
 #include <tools/hostosinfo.h>
 #include <tools/profile.h>
 #include <tools/settings.h>
 #include <tools/shellutils.h>
 #include <tools/version.h>
 
+#include <QtCore/qdebug.h>
 #include <QtCore/qjsonarray.h>
 #include <QtCore/qjsondocument.h>
 #include <QtCore/qjsonobject.h>
diff --git a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
index 3ca652063..672194bfc 100644
--- a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
+++ b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
@@ -30,7 +30,6 @@
 #include <app/shared/logging/consolelogger.h>
 #include <tools/buildoptions.h>
 #include <tools/error.h>
-#include <tools/fileinfo.h>
 #include <tools/hostosinfo.h>
 
 #include <QtCore/qdir.h>