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>

11 files changed, 31 insertions, 28 deletions

diff --git a/tests/benchmarker/activities.h b/tests/benchmarker/activities.h
index 643fc0fdc..f348f11d3 100644
--- a/tests/benchmarker/activities.h
+++ b/tests/benchmarker/activities.h
@@ -28,7 +28,7 @@
 #ifndef QBS_BENCHMARKER_ACTIVITY_H
 #define QBS_BENCHMARKER_ACTIVITY_H
 
-#include <QFlags>
+#include <QtCore/qflags.h>
 
 namespace qbsBenchmarker {
 
diff --git a/tests/benchmarker/benchmarker-main.cpp b/tests/benchmarker/benchmarker-main.cpp
index 00fa09039..cb84576e2 100644
--- a/tests/benchmarker/benchmarker-main.cpp
+++ b/tests/benchmarker/benchmarker-main.cpp
@@ -30,7 +30,7 @@
 #include "commandlineparser.h"
 #include "exception.h"
 
-#include <QCoreApplication>
+#include <QtCore/qcoreapplication.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tests/benchmarker/benchmarker.cpp b/tests/benchmarker/benchmarker.cpp
index becf60dec..26d863aaa 100644
--- a/tests/benchmarker/benchmarker.cpp
+++ b/tests/benchmarker/benchmarker.cpp
@@ -31,7 +31,7 @@
 #include "runsupport.h"
 #include "valgrindrunner.h"
 
-#include <QtConcurrent>
+#include <QtConcurrent/qtconcurrentrun.h>
 
 #include <iostream>
 
diff --git a/tests/benchmarker/benchmarker.h b/tests/benchmarker/benchmarker.h
index 3d2c4f589..b6995de41 100644
--- a/tests/benchmarker/benchmarker.h
+++ b/tests/benchmarker/benchmarker.h
@@ -30,9 +30,9 @@
 
 #include "activities.h"
 
-#include <QHash>
-#include <QString>
-#include <QTemporaryDir>
+#include <QtCore/qhash.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qtemporarydir.h>
 
 QT_BEGIN_NAMESPACE
 class QStringList;
diff --git a/tests/benchmarker/commandlineparser.cpp b/tests/benchmarker/commandlineparser.cpp
index 49fe2c12e..84650cfdc 100644
--- a/tests/benchmarker/commandlineparser.cpp
+++ b/tests/benchmarker/commandlineparser.cpp
@@ -29,10 +29,10 @@
 
 #include "exception.h"
 
-#include <QCommandLineOption>
-#include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QFileInfo>
+#include <QtCore/qcommandlineoption.h>
+#include <QtCore/qcommandlineparser.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qfileinfo.h>
 
 namespace qbsBenchmarker {
 
diff --git a/tests/benchmarker/commandlineparser.h b/tests/benchmarker/commandlineparser.h
index 4b83f2ddf..0e4eb707a 100644
--- a/tests/benchmarker/commandlineparser.h
+++ b/tests/benchmarker/commandlineparser.h
@@ -30,7 +30,7 @@
 
 #include "activities.h"
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 
 namespace qbsBenchmarker {
 
diff --git a/tests/benchmarker/exception.h b/tests/benchmarker/exception.h
index 36163ad16..3771dc89d 100644
--- a/tests/benchmarker/exception.h
+++ b/tests/benchmarker/exception.h
@@ -28,8 +28,8 @@
 #ifndef QBS_BENCHMARKER_EXCEPTION_H
 #define QBS_BENCHMARKER_EXCEPTION_H
 
-#include <QException>
-#include <QString>
+#include <QtCore/qexception.h>
+#include <QtCore/qstring.h>
 
 namespace qbsBenchmarker {
 
diff --git a/tests/benchmarker/runsupport.cpp b/tests/benchmarker/runsupport.cpp
index 669cd3ae5..e01200067 100644
--- a/tests/benchmarker/runsupport.cpp
+++ b/tests/benchmarker/runsupport.cpp
@@ -29,10 +29,10 @@
 
 #include "exception.h"
 
-#include <QByteArray>
-#include <QProcess>
-#include <QString>
-#include <QStringList>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
 
 namespace qbsBenchmarker {
 
diff --git a/tests/benchmarker/runsupport.h b/tests/benchmarker/runsupport.h
index 9c09019c8..6ee831007 100644
--- a/tests/benchmarker/runsupport.h
+++ b/tests/benchmarker/runsupport.h
@@ -28,8 +28,8 @@
 #ifndef QBS_BENCHMARKER_RUNSUPPORT_H
 #define QBS_BENCHMARKER_RUNSUPPORT_H
 
-#include <QtGlobal>
-#include <QString>
+#include <QtCore/qglobal.h>
+#include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp
index c9ab97664..c46493ed4 100644
--- a/tests/benchmarker/valgrindrunner.cpp
+++ b/tests/benchmarker/valgrindrunner.cpp
@@ -30,12 +30,15 @@
 #include "exception.h"
 #include "runsupport.h"
 
-#include <QBuffer>
-#include <QDir>
-#include <QFile>
-#include <QMutexLocker>
-#include <QStringList>
-#include <QtConcurrent>
+#include <QtCore/qbuffer.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qfuture.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qxmlstream.h>
+
+#include <QtConcurrent/qtconcurrentrun.h>
 
 namespace qbsBenchmarker {
 
diff --git a/tests/benchmarker/valgrindrunner.h b/tests/benchmarker/valgrindrunner.h
index 0cad277d0..04c4ff311 100644
--- a/tests/benchmarker/valgrindrunner.h
+++ b/tests/benchmarker/valgrindrunner.h
@@ -30,9 +30,9 @@
 
 #include "activities.h"
 
-#include <QList>
-#include <QMutex>
-#include <QString>
+#include <QtCore/qlist.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 class QStringList;