diff options
Diffstat (limited to 'src/app')
47 files changed, 105 insertions, 104 deletions
diff --git a/src/app/config-ui/commandlineparser.cpp b/src/app/config-ui/commandlineparser.cpp index 32004d171..718b64b0a 100644 --- a/src/app/config-ui/commandlineparser.cpp +++ b/src/app/config-ui/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/config-ui/commandlineparser.h b/src/app/config-ui/commandlineparser.h index 8abda4257..5902f4065 100644 --- a/src/app/config-ui/commandlineparser.h +++ b/src/app/config-ui/commandlineparser.h @@ -39,7 +39,7 @@ #ifndef QBS_CONFIGUI_COMMANDLINEPARSER_H #define QBS_CONFIGUI_COMMANDLINEPARSER_H -#include <QStringList> +#include <QtCore/qstringlist.h> class CommandLineParser { diff --git a/src/app/config-ui/main.cpp b/src/app/config-ui/main.cpp index cec37baa0..ea4c25760 100644 --- a/src/app/config-ui/main.cpp +++ b/src/app/config-ui/main.cpp @@ -43,7 +43,7 @@ #include <logging/translator.h> #include <tools/error.h> -#include <QApplication> +#include <QtWidgets/qapplication.h> #include <cstdlib> #include <iostream> diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp index 250e1c597..c5f629278 100644 --- a/src/app/config-ui/mainwindow.cpp +++ b/src/app/config-ui/mainwindow.cpp @@ -41,15 +41,17 @@ #include <tools/settingsmodel.h> -#include <QAction> -#include <QKeyEvent> -#include <QKeySequence> -#include <QMenu> -#include <QMenuBar> -#include <QMessageBox> -#include <QModelIndex> -#include <QPoint> -#include <QString> +#include <QtCore/qabstractitemmodel.h> +#include <QtCore/qpoint.h> +#include <QtCore/qstring.h> + +#include <QtGui/qevent.h> +#include <QtGui/qkeysequence.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qmenubar.h> +#include <QtWidgets/qmessagebox.h> MainWindow::MainWindow(const QString &settingsDir, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) diff --git a/src/app/config-ui/mainwindow.h b/src/app/config-ui/mainwindow.h index c5ee0e576..73a01bc6a 100644 --- a/src/app/config-ui/mainwindow.h +++ b/src/app/config-ui/mainwindow.h @@ -39,7 +39,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QMainWindow> +#include <QtWidgets/qmainwindow.h> namespace qbs { class SettingsModel; } diff --git a/src/app/config/configcommand.h b/src/app/config/configcommand.h index e86be48f1..1574e3745 100644 --- a/src/app/config/configcommand.h +++ b/src/app/config/configcommand.h @@ -41,8 +41,8 @@ #include <tools/settings.h> -#include <QString> -#include <QStringList> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> class ConfigCommand { diff --git a/src/app/config/configcommandexecutor.cpp b/src/app/config/configcommandexecutor.cpp index 7e36aad82..9341663dd 100644 --- a/src/app/config/configcommandexecutor.cpp +++ b/src/app/config/configcommandexecutor.cpp @@ -44,9 +44,9 @@ #include <tools/settingsmodel.h> #include <tools/error.h> -#include <QDir> -#include <QFile> -#include <QTextStream> +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qtextstream.h> #include <cstdio> diff --git a/src/app/config/configcommandexecutor.h b/src/app/config/configcommandexecutor.h index 50c92df9b..c0383a436 100644 --- a/src/app/config/configcommandexecutor.h +++ b/src/app/config/configcommandexecutor.h @@ -39,7 +39,7 @@ #ifndef CONFIGCOMMANDEXECUTOR_H #define CONFIGCOMMANDEXECUTOR_H -#include <QCoreApplication> +#include <QtCore/qcoreapplication.h> namespace qbs { class Settings; } diff --git a/src/app/config/configcommandlineparser.h b/src/app/config/configcommandlineparser.h index 9d3b14202..5427c9187 100644 --- a/src/app/config/configcommandlineparser.h +++ b/src/app/config/configcommandlineparser.h @@ -41,7 +41,7 @@ #include "configcommand.h" -#include <QStringList> +#include <QtCore/qstringlist.h> class ConfigCommandLineParser { diff --git a/src/app/config/configmain.cpp b/src/app/config/configmain.cpp index d8a4e2416..f97369ce5 100644 --- a/src/app/config/configmain.cpp +++ b/src/app/config/configmain.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-qmltypes/main.cpp b/src/app/qbs-qmltypes/main.cpp index cbf7839ec..a7cfebf6b 100644 --- a/src/app/qbs-qmltypes/main.cpp +++ b/src/app/qbs-qmltypes/main.cpp @@ -41,8 +41,8 @@ #include <api/languageinfo.h> #include <logging/translator.h> -#include <QCoreApplication> -#include <QByteArray> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qbytearray.h> #include <cstdlib> #include <iostream> diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index 5d6a49b56..b608385a2 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -45,8 +45,8 @@ #include <tools/profile.h> #include <tools/version.h> -#include <QDir> -#include <QString> +#include <QtCore/qdir.h> +#include <QtCore/qstring.h> using namespace qbs; using qbs::Internal::Tr; diff --git a/src/app/qbs-setup-android/android-setup.h b/src/app/qbs-setup-android/android-setup.h index 6314f5c77..8cefc5f00 100644 --- a/src/app/qbs-setup-android/android-setup.h +++ b/src/app/qbs-setup-android/android-setup.h @@ -40,7 +40,7 @@ #ifndef QBS_SETUP_ANDROID_SDKSETUP_H #define QBS_SETUP_ANDROID_SDKSETUP_H -#include <QtGlobal> +#include <QtCore/qglobal.h> namespace qbs { class Settings; } diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp index e5ac535f9..cecd44fc9 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -41,7 +41,7 @@ #include <logging/translator.h> #include <tools/error.h> -#include <QFileInfo> +#include <QtCore/qfileinfo.h> CommandLineParser::CommandLineParser() { diff --git a/src/app/qbs-setup-android/commandlineparser.h b/src/app/qbs-setup-android/commandlineparser.h index cd3c68841..89da253c6 100644 --- a/src/app/qbs-setup-android/commandlineparser.h +++ b/src/app/qbs-setup-android/commandlineparser.h @@ -39,7 +39,7 @@ #ifndef QBS_SETUP_ANDROID_COMMANDLINEPARSER_H #define QBS_SETUP_ANDROID_COMMANDLINEPARSER_H -#include <QStringList> +#include <QtCore/qstringlist.h> class CommandLineParser { diff --git a/src/app/qbs-setup-android/main.cpp b/src/app/qbs-setup-android/main.cpp index 37b4c82f6..63cb97c0f 100644 --- a/src/app/qbs-setup-android/main.cpp +++ b/src/app/qbs-setup-android/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-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; 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; 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 { diff --git a/src/app/shared/logging/coloredoutput.cpp b/src/app/shared/logging/coloredoutput.cpp index 59743d56e..33e647d36 100644 --- a/src/app/shared/logging/coloredoutput.cpp +++ b/src/app/shared/logging/coloredoutput.cpp @@ -38,9 +38,9 @@ ****************************************************************************/ #include "coloredoutput.h" -#include <QtGlobal> +#include <QtCore/qglobal.h> #ifdef Q_OS_WIN32 -# include <qt_windows.h> +# include <QtCore/qt_windows.h> #endif #include <cstdarg> |