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>

22 files changed, 52 insertions, 54 deletions

diff --git a/src/lib/corelib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp
index fddebc62a..ad070744c 100644
--- a/src/lib/corelib/api/changeset.cpp
+++ b/src/lib/corelib/api/changeset.cpp
@@ -39,7 +39,7 @@
 
 #include "changeset.h"
 
-#include <QTextCursor>
+#include <QtGui/qtextcursor.h>
 
 namespace QbsQmlJS {
 
diff --git a/src/lib/corelib/api/changeset.h b/src/lib/corelib/api/changeset.h
index 6a0593cb6..4991da7d5 100644
--- a/src/lib/corelib/api/changeset.h
+++ b/src/lib/corelib/api/changeset.h
@@ -40,8 +40,8 @@
 #ifndef QBS_CHANGESET_H
 #define QBS_CHANGESET_H
 
-#include <QString>
-#include <QList>
+#include <QtCore/qstring.h>
+#include <QtCore/qlist.h>
 
 QT_FORWARD_DECLARE_CLASS(QTextCursor)
 
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp
index d9b97329a..98df419da 100644
--- a/src/lib/corelib/api/internaljobs.cpp
+++ b/src/lib/corelib/api/internaljobs.cpp
@@ -59,9 +59,9 @@
 #include <tools/preferences.h>
 #include <tools/qbsassert.h>
 
-#include <QEventLoop>
-#include <QScopedPointer>
-#include <QTimer>
+#include <QtCore/qeventloop.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qtimer.h>
 
 namespace qbs {
 namespace Internal {
diff --git a/src/lib/corelib/api/internaljobs.h b/src/lib/corelib/api/internaljobs.h
index 8553719e3..f0260cc98 100644
--- a/src/lib/corelib/api/internaljobs.h
+++ b/src/lib/corelib/api/internaljobs.h
@@ -48,9 +48,9 @@
 #include <tools/error.h>
 #include <tools/setupprojectparameters.h>
 
-#include <QList>
-#include <QObject>
-#include <QThread>
+#include <QtCore/qlist.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qthread.h>
 
 namespace qbs {
 class ProcessResult;
diff --git a/src/lib/corelib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp
index 1533c4c25..6589aa359 100644
--- a/src/lib/corelib/api/jobs.cpp
+++ b/src/lib/corelib/api/jobs.cpp
@@ -43,7 +43,7 @@
 #include <language/language.h>
 #include <tools/qbsassert.h>
 
-#include <QTimer>
+#include <QtCore/qtimer.h>
 
 namespace qbs {
 using namespace Internal;
diff --git a/src/lib/corelib/api/jobs.h b/src/lib/corelib/api/jobs.h
index c293094b6..cf9f337f2 100644
--- a/src/lib/corelib/api/jobs.h
+++ b/src/lib/corelib/api/jobs.h
@@ -44,9 +44,9 @@
 #include "../tools/error.h"
 #include "../tools/qbs_export.h"
 
-#include <QObject>
-#include <QProcess>
-#include <QVariantMap>
+#include <QtCore/qobject.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qvariant.h>
 
 namespace qbs {
 class BuildOptions;
diff --git a/src/lib/corelib/api/languageinfo.cpp b/src/lib/corelib/api/languageinfo.cpp
index 2b330c182..4ba3c6c01 100644
--- a/src/lib/corelib/api/languageinfo.cpp
+++ b/src/lib/corelib/api/languageinfo.cpp
@@ -42,7 +42,7 @@
 #include <language/builtindeclarations.h>
 #include <tools/version.h>
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/api/languageinfo.h b/src/lib/corelib/api/languageinfo.h
index 66f039b6b..22994b546 100644
--- a/src/lib/corelib/api/languageinfo.h
+++ b/src/lib/corelib/api/languageinfo.h
@@ -42,7 +42,7 @@
 
 #include "../tools/qbs_export.h"
 
-#include <QByteArray>
+#include <QtCore/qbytearray.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index e44d22401..b2164c28b 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -76,12 +76,10 @@
 #include <tools/setupprojectparameters.h>
 #include <tools/qbsassert.h>
 
-#include <QDir>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QRegExp>
-#include <QSharedData>
-#include <QtDebug>
+#include <QtCore/qdir.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qregexp.h>
+#include <QtCore/qshareddata.h>
 
 #ifdef QBS_STATIC_LIB
 extern "C" ScannerPlugin *cppScanners[];
diff --git a/src/lib/corelib/api/project.h b/src/lib/corelib/api/project.h
index ccf1d7365..0462682b1 100644
--- a/src/lib/corelib/api/project.h
+++ b/src/lib/corelib/api/project.h
@@ -43,12 +43,12 @@
 #include "../language/forward_decls.h"
 #include "../tools/qbs_export.h"
 
-#include <QExplicitlySharedDataPointer>
-#include <QHash>
-#include <QList>
-#include <QSet>
-#include <QStringList>
-#include <QVariantMap>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qset.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 class QIODevice;
diff --git a/src/lib/corelib/api/project_p.h b/src/lib/corelib/api/project_p.h
index 7377f6d13..85645f54d 100644
--- a/src/lib/corelib/api/project_p.h
+++ b/src/lib/corelib/api/project_p.h
@@ -45,8 +45,8 @@
 #include <language/language.h>
 #include <logging/logger.h>
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/qobject.h>
+#include <QtCore/qstringlist.h>
 
 namespace qbs {
 class BuildJob;
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 94ae87c7a..d40fa7ac2 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -45,7 +45,7 @@
 #include <tools/jsliterals.h>
 #include <tools/qbsassert.h>
 
-#include <QDir>
+#include <QtCore/qdir.h>
 
 #include <algorithm>
 
diff --git a/src/lib/corelib/api/projectdata.h b/src/lib/corelib/api/projectdata.h
index 3e4065c53..540d6b677 100644
--- a/src/lib/corelib/api/projectdata.h
+++ b/src/lib/corelib/api/projectdata.h
@@ -42,12 +42,12 @@
 #include "../tools/codelocation.h"
 #include "../tools/qbs_export.h"
 
-#include <QExplicitlySharedDataPointer>
-#include <QList>
-#include <QPair>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qvariant.h>
 
 namespace qbs {
 namespace Internal {
diff --git a/src/lib/corelib/api/projectdata_p.h b/src/lib/corelib/api/projectdata_p.h
index 3df3383ec..9eee68db2 100644
--- a/src/lib/corelib/api/projectdata_p.h
+++ b/src/lib/corelib/api/projectdata_p.h
@@ -41,7 +41,7 @@
 
 #include "projectdata.h"
 
-#include <QSharedData>
+#include <QtCore/qshareddata.h>
 
 namespace qbs {
 namespace Internal {
diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp
index 2881d45b0..6ac3c60dd 100644
--- a/src/lib/corelib/api/projectfileupdater.cpp
+++ b/src/lib/corelib/api/projectfileupdater.cpp
@@ -53,7 +53,7 @@
 #include <tools/jsliterals.h>
 #include <tools/qbsassert.h>
 
-#include <QFile>
+#include <QtCore/qfile.h>
 
 using namespace QbsQmlJS;
 using namespace AST;
diff --git a/src/lib/corelib/api/projectfileupdater.h b/src/lib/corelib/api/projectfileupdater.h
index f8bf4e183..7615b45f9 100644
--- a/src/lib/corelib/api/projectfileupdater.h
+++ b/src/lib/corelib/api/projectfileupdater.h
@@ -44,7 +44,7 @@
 #include <tools/error.h>
 #include <tools/codelocation.h>
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 
 namespace QbsQmlJS { namespace AST { class UiProgram; } }
 
diff --git a/src/lib/corelib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp
index 8ce0b1e85..8d8d071a9 100644
--- a/src/lib/corelib/api/qmljsrewriter.cpp
+++ b/src/lib/corelib/api/qmljsrewriter.cpp
@@ -41,9 +41,9 @@
 
 #include <parser/qmljsast_p.h>
 
-#include <QTextBlock>
-#include <QTextCursor>
-#include <QTextDocument>
+#include <QtGui/qtextobject.h>
+#include <QtGui/qtextcursor.h>
+#include <QtGui/qtextdocument.h>
 
 namespace QbsQmlJS {
 using namespace AST;
diff --git a/src/lib/corelib/api/qmljsrewriter.h b/src/lib/corelib/api/qmljsrewriter.h
index 901467d60..0a575496c 100644
--- a/src/lib/corelib/api/qmljsrewriter.h
+++ b/src/lib/corelib/api/qmljsrewriter.h
@@ -44,7 +44,7 @@
 
 #include <parser/qmljsastfwd_p.h>
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 
 namespace QbsQmlJS {
 
diff --git a/src/lib/corelib/api/rulecommand.h b/src/lib/corelib/api/rulecommand.h
index cca1db843..54862ec31 100644
--- a/src/lib/corelib/api/rulecommand.h
+++ b/src/lib/corelib/api/rulecommand.h
@@ -42,8 +42,8 @@
 
 #include <tools/qbs_export.h>
 
-#include <QExplicitlySharedDataPointer>
-#include <QStringList>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 class QProcessEnvironment;
diff --git a/src/lib/corelib/api/rulecommand_p.h b/src/lib/corelib/api/rulecommand_p.h
index 246e9520c..253ec4056 100644
--- a/src/lib/corelib/api/rulecommand_p.h
+++ b/src/lib/corelib/api/rulecommand_p.h
@@ -42,8 +42,8 @@
 
 #include "rulecommand.h"
 
-#include <QProcessEnvironment>
-#include <QSharedData>
+#include <QtCore/qprocess.h>
+#include <QtCore/qshareddata.h>
 
 namespace qbs {
 namespace Internal {
diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp
index 60487293b..0be54558e 100644
--- a/src/lib/corelib/api/runenvironment.cpp
+++ b/src/lib/corelib/api/runenvironment.cpp
@@ -54,12 +54,12 @@
 #include <tools/qbsassert.h>
 #include <tools/shellutils.h>
 
-#include <QDir>
-#include <QProcess>
-#include <QProcessEnvironment>
-#include <QScopedPointer>
-#include <QTemporaryFile>
-#include <QVariantMap>
+#include <QtCore/qdir.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qtemporaryfile.h>
+#include <QtCore/qvariant.h>
 
 #include <stdlib.h>
 
diff --git a/src/lib/corelib/api/runenvironment.h b/src/lib/corelib/api/runenvironment.h
index 6c33dd67a..ef44b24b6 100644
--- a/src/lib/corelib/api/runenvironment.h
+++ b/src/lib/corelib/api/runenvironment.h
@@ -43,7 +43,7 @@
 #include <language/forward_decls.h>
 #include <tools/qbs_export.h>
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 class QProcessEnvironment;