Change style of #includes of Qt headers

By using q<lowercase>.h headers, we become more bootstrap-friendly, as no
full syncqt is required any more.

In the same go, prefix all includes with the module name. This helps
grep-based analysis of which parts of Qt are used and where. It's also
consistent with Qt's public headers (where syncqt enforces the style).

Testdata and examples are excluded from the change, as they are not
relevant for bootstrapping.

Change-Id: I9539b1d795e87fca6e5fc6c91acbb775b79208d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

9 files changed, 23 insertions, 23 deletions

diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp
index 84f7abe9a..498cabdc7 100644
--- a/src/app/qbs-setup-toolchains/commandlineparser.cpp
+++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp
@@ -41,7 +41,7 @@
 #include <logging/translator.h>
 #include <tools/error.h>
 
-#include <QFileInfo>
+#include <QtCore/qfileinfo.h>
 
 using qbs::Internal::Tr;
 
diff --git a/src/app/qbs-setup-toolchains/commandlineparser.h b/src/app/qbs-setup-toolchains/commandlineparser.h
index f7821666a..5737d318b 100644
--- a/src/app/qbs-setup-toolchains/commandlineparser.h
+++ b/src/app/qbs-setup-toolchains/commandlineparser.h
@@ -39,7 +39,7 @@
 #ifndef QBS_SETUPTOOLCHAINS_COMMANDLINEPARSER_H
 #define QBS_SETUPTOOLCHAINS_COMMANDLINEPARSER_H
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 
 class CommandLineParser
 {
diff --git a/src/app/qbs-setup-toolchains/main.cpp b/src/app/qbs-setup-toolchains/main.cpp
index 55e806f98..546ae3adb 100644
--- a/src/app/qbs-setup-toolchains/main.cpp
+++ b/src/app/qbs-setup-toolchains/main.cpp
@@ -44,7 +44,7 @@
 #include <tools/error.h>
 #include <tools/settings.h>
 
-#include <QCoreApplication>
+#include <QtCore/qcoreapplication.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 993e12377..fed152e10 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -52,11 +52,11 @@
 #include <tools/visualstudioversioninfo.h>
 #include <tools/vsenvironmentdetector.h>
 
-#include <QDir>
-#include <QFileInfo>
-#include <QSettings>
-#include <QStringList>
-#include <QVector>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qsettings.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qvector.h>
 
 using namespace qbs;
 using namespace qbs::Internal;
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.h b/src/app/qbs-setup-toolchains/msvcprobe.h
index 38889b2e5..0fa209548 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.h
+++ b/src/app/qbs-setup-toolchains/msvcprobe.h
@@ -40,7 +40,7 @@
 #ifndef MSVCPROBE_H
 #define MSVCPROBE_H
 
-#include <QList>
+#include <QtCore/qlist.h>
 
 namespace qbs {
 class Profile;
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index de4e92764..735285718 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -49,11 +49,11 @@
 #include <tools/settings.h>
 #include <tools/toolchains.h>
 
-#include <QDir>
-#include <QFileInfo>
-#include <QProcess>
-#include <QStringList>
-#include <QTextStream>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qtextstream.h>
 
 #include <cstdio>
 
diff --git a/src/app/qbs-setup-toolchains/probe.h b/src/app/qbs-setup-toolchains/probe.h
index 8f2ca3588..5c8774ddb 100644
--- a/src/app/qbs-setup-toolchains/probe.h
+++ b/src/app/qbs-setup-toolchains/probe.h
@@ -39,7 +39,7 @@
 #ifndef QBS_PROBE_H
 #define QBS_PROBE_H
 
-#include <QtGlobal>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index 1e9abe73e..0b38750cf 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -47,13 +47,13 @@
 #include <tools/profile.h>
 #include <tools/settings.h>
 
-#include <QStringList>
-#include <QProcess>
-#include <QByteArray>
-#include <QFileInfo>
-#include <QDir>
-#include <QSettings>
-#include <QRegularExpression>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qsettings.h>
+#include <QtCore/qregularexpression.h>
 
 using namespace qbs;
 using Internal::Tr;
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.h b/src/app/qbs-setup-toolchains/xcodeprobe.h
index 84c35166a..11fc2bffa 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.h
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.h
@@ -40,7 +40,7 @@
 #ifndef XCODEPROBE_H
 #define XCODEPROBE_H
 
-#include <QList>
+#include <QtCore/qlist.h>
 
 namespace qbs {
 class Profile;