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>

5 files changed, 14 insertions, 15 deletions

diff --git a/src/app/qbs-setup-qt/commandlineparser.cpp b/src/app/qbs-setup-qt/commandlineparser.cpp
index 2f12a92bc..289386529 100644
--- a/src/app/qbs-setup-qt/commandlineparser.cpp
+++ b/src/app/qbs-setup-qt/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-qt/commandlineparser.h b/src/app/qbs-setup-qt/commandlineparser.h
index eda3c43ce..4329136d6 100644
--- a/src/app/qbs-setup-qt/commandlineparser.h
+++ b/src/app/qbs-setup-qt/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-qt/main.cpp b/src/app/qbs-setup-qt/main.cpp
index 7164d883f..3936150fa 100644
--- a/src/app/qbs-setup-qt/main.cpp
+++ b/src/app/qbs-setup-qt/main.cpp
@@ -44,9 +44,9 @@
 #include <logging/translator.h>
 #include <tools/settings.h>
 
-#include <QCoreApplication>
-#include <QFileInfo>
-#include <QStringList>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qstringlist.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index b9531566a..b324ce6c7 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -48,14 +48,13 @@
 #include <tools/settings.h>
 #include <tools/version.h>
 
-#include <QByteArrayMatcher>
-#include <QCoreApplication>
-#include <QDir>
-#include <QFileInfo>
-#include <QProcess>
-#include <QRegExp>
-#include <QStringList>
-#include <QtDebug>
+#include <QtCore/qbytearraymatcher.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qregexp.h>
+#include <QtCore/qstringlist.h>
 
 #include <algorithm>
 
diff --git a/src/app/qbs-setup-qt/setupqt.h b/src/app/qbs-setup-qt/setupqt.h
index fc6117360..f5ac44c9c 100644
--- a/src/app/qbs-setup-qt/setupqt.h
+++ b/src/app/qbs-setup-qt/setupqt.h
@@ -41,8 +41,8 @@
 #define QBS_SETUPQT_H
 
 #include <tools/error.h>
-#include <QCoreApplication>
-#include <QStringList>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qstringlist.h>
 
 namespace qbs {
 class QtEnvironment;