aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/qbs
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/qbs')
-rw-r--r--src/app/qbs/application.h2
-rw-r--r--src/app/qbs/commandlinefrontend.cpp8
-rw-r--r--src/app/qbs/commandlinefrontend.h6
-rw-r--r--src/app/qbs/consoleprogressobserver.cpp4
-rw-r--r--src/app/qbs/consoleprogressobserver.h2
-rw-r--r--src/app/qbs/ctrlchandler.cpp2
-rw-r--r--src/app/qbs/main.cpp2
-rw-r--r--src/app/qbs/parser/command.cpp4
-rw-r--r--src/app/qbs/parser/commandlineoption.h2
-rw-r--r--src/app/qbs/parser/commandlineoptionpool.h2
-rw-r--r--src/app/qbs/parser/commandlineparser.cpp10
-rw-r--r--src/app/qbs/parser/commandlineparser.h4
-rw-r--r--src/app/qbs/parser/commandpool.h2
-rw-r--r--src/app/qbs/qbstool.cpp8
-rw-r--r--src/app/qbs/qbstool.h2
-rw-r--r--src/app/qbs/status.cpp10
16 files changed, 35 insertions, 35 deletions
diff --git a/src/app/qbs/application.h b/src/app/qbs/application.h
index a38212df1..747c2f7e7 100644
--- a/src/app/qbs/application.h
+++ b/src/app/qbs/application.h
@@ -40,7 +40,7 @@
#ifndef APPLICATION_H
#define APPLICATION_H
-#include <QCoreApplication>
+#include <QtCore/qcoreapplication.h>
namespace qbs {
class CommandLineFrontend;
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index 0b712df1e..906d9f983 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -51,10 +51,10 @@
#include <tools/projectgeneratormanager.h>
#include <tools/shellutils.h>
-#include <QDir>
-#include <QFile>
-#include <QProcessEnvironment>
-#include <QTimer>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qtimer.h>
#include <cstdlib>
#include <cstdio>
diff --git a/src/app/qbs/commandlinefrontend.h b/src/app/qbs/commandlinefrontend.h
index aa4e288f0..e10240773 100644
--- a/src/app/qbs/commandlinefrontend.h
+++ b/src/app/qbs/commandlinefrontend.h
@@ -43,9 +43,9 @@
#include <api/project.h>
#include <api/projectdata.h>
-#include <QHash>
-#include <QList>
-#include <QObject>
+#include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qobject.h>
QT_BEGIN_NAMESPACE
class QTimer;
diff --git a/src/app/qbs/consoleprogressobserver.cpp b/src/app/qbs/consoleprogressobserver.cpp
index 191e3184f..b6110077b 100644
--- a/src/app/qbs/consoleprogressobserver.cpp
+++ b/src/app/qbs/consoleprogressobserver.cpp
@@ -38,8 +38,8 @@
****************************************************************************/
#include "consoleprogressobserver.h"
-#include <QByteArray>
-#include <QString>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qstring.h>
#include <iostream>
diff --git a/src/app/qbs/consoleprogressobserver.h b/src/app/qbs/consoleprogressobserver.h
index 2f6cbb97a..f14234ef2 100644
--- a/src/app/qbs/consoleprogressobserver.h
+++ b/src/app/qbs/consoleprogressobserver.h
@@ -39,7 +39,7 @@
#ifndef CONSOLEPROGRESSOBSERVER_H
#define CONSOLEPROGRESSOBSERVER_H
-#include <QtGlobal>
+#include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE
class QString;
diff --git a/src/app/qbs/ctrlchandler.cpp b/src/app/qbs/ctrlchandler.cpp
index e1f67c4a7..b2e293d14 100644
--- a/src/app/qbs/ctrlchandler.cpp
+++ b/src/app/qbs/ctrlchandler.cpp
@@ -48,7 +48,7 @@ static void cancel()
#if defined(Q_OS_WIN) && defined(Q_CC_MSVC)
-#include <qt_windows.h>
+#include <QtCore/qt_windows.h>
static BOOL WINAPI consoleCtrlHandlerRoutine(__in DWORD dwCtrlType)
{
diff --git a/src/app/qbs/main.cpp b/src/app/qbs/main.cpp
index 739c9bd6e..408823f8e 100644
--- a/src/app/qbs/main.cpp
+++ b/src/app/qbs/main.cpp
@@ -45,7 +45,7 @@
#include <qbs.h>
-#include <QTimer>
+#include <QtCore/qtimer.h>
#include <cstdlib>
using namespace qbs;
diff --git a/src/app/qbs/parser/command.cpp b/src/app/qbs/parser/command.cpp
index 0c2214739..ff8847944 100644
--- a/src/app/qbs/parser/command.cpp
+++ b/src/app/qbs/parser/command.cpp
@@ -45,8 +45,8 @@
#include <tools/error.h>
#include <tools/hostosinfo.h>
-#include <QMap>
-#include <QSet>
+#include <QtCore/qmap.h>
+#include <QtCore/qset.h>
namespace qbs {
using namespace Internal;
diff --git a/src/app/qbs/parser/commandlineoption.h b/src/app/qbs/parser/commandlineoption.h
index 9a9efd7e8..cf16b475f 100644
--- a/src/app/qbs/parser/commandlineoption.h
+++ b/src/app/qbs/parser/commandlineoption.h
@@ -43,7 +43,7 @@
#include <tools/commandechomode.h>
-#include <QStringList>
+#include <QtCore/qstringlist.h>
namespace qbs {
diff --git a/src/app/qbs/parser/commandlineoptionpool.h b/src/app/qbs/parser/commandlineoptionpool.h
index b878317af..74fd8e8c1 100644
--- a/src/app/qbs/parser/commandlineoptionpool.h
+++ b/src/app/qbs/parser/commandlineoptionpool.h
@@ -41,7 +41,7 @@
#include "commandlineoption.h"
-#include <QHash>
+#include <QtCore/qhash.h>
namespace qbs {
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index ed72a06d2..8ae4dd3a8 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -57,11 +57,11 @@
#include <tools/settings.h>
#include <tools/settingsmodel.h>
-#include <QCoreApplication>
-#include <QDir>
-#include <QMap>
-#include <QPair>
-#include <QTextStream>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qtextstream.h>
#ifdef Q_OS_UNIX
#include <unistd.h>
diff --git a/src/app/qbs/parser/commandlineparser.h b/src/app/qbs/parser/commandlineparser.h
index dd9c30f42..da9bce31d 100644
--- a/src/app/qbs/parser/commandlineparser.h
+++ b/src/app/qbs/parser/commandlineparser.h
@@ -41,8 +41,8 @@
#include "commandtype.h"
-#include <QStringList>
-#include <QVariant>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qvariant.h>
namespace qbs {
class BuildOptions;
diff --git a/src/app/qbs/parser/commandpool.h b/src/app/qbs/parser/commandpool.h
index 1184c9c2a..c42017d0b 100644
--- a/src/app/qbs/parser/commandpool.h
+++ b/src/app/qbs/parser/commandpool.h
@@ -41,7 +41,7 @@
#include "commandtype.h"
-#include <QHash>
+#include <QtCore/qhash.h>
namespace qbs {
class Command;
diff --git a/src/app/qbs/qbstool.cpp b/src/app/qbs/qbstool.cpp
index b3efc9657..d9afda270 100644
--- a/src/app/qbs/qbstool.cpp
+++ b/src/app/qbs/qbstool.cpp
@@ -40,10 +40,10 @@
#include <tools/hostosinfo.h>
-#include <QCoreApplication>
-#include <QDir>
-#include <QFileInfo>
-#include <QProcess>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qprocess.h>
#include <iostream>
diff --git a/src/app/qbs/qbstool.h b/src/app/qbs/qbstool.h
index 1cbe08a17..c1d7f75d8 100644
--- a/src/app/qbs/qbstool.h
+++ b/src/app/qbs/qbstool.h
@@ -40,7 +40,7 @@
#ifndef QBS_QBSTOOL_H
#define QBS_QBSTOOL_H
-#include <QStringList>
+#include <QtCore/qstringlist.h>
class QbsTool
{
diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp
index 9ef2f5da1..814d63c1c 100644
--- a/src/app/qbs/status.cpp
+++ b/src/app/qbs/status.cpp
@@ -43,11 +43,11 @@
#include <qbs.h>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QString>
-#include <QRegExp>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qregexp.h>
namespace qbs {