diff options
Diffstat (limited to 'src')
320 files changed, 839 insertions, 804 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> 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; diff --git a/src/lib/corelib/buildgraph/abstractcommandexecutor.h b/src/lib/corelib/buildgraph/abstractcommandexecutor.h index e70dbbb86..7ff769396 100644 --- a/src/lib/corelib/buildgraph/abstractcommandexecutor.h +++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.h @@ -44,7 +44,7 @@ #include <tools/commandechomode.h> #include <tools/error.h> -#include <QObject> +#include <QtCore/qobject.h> namespace qbs { class ErrorInfo; diff --git a/src/lib/corelib/buildgraph/artifact.h b/src/lib/corelib/buildgraph/artifact.h index 07cd94cbc..0d3e4062c 100644 --- a/src/lib/corelib/buildgraph/artifact.h +++ b/src/lib/corelib/buildgraph/artifact.h @@ -47,8 +47,8 @@ #include <language/filetags.h> #include <tools/filetime.h> -#include <QSet> -#include <QString> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/artifactcleaner.cpp b/src/lib/corelib/buildgraph/artifactcleaner.cpp index 3ea024031..9eef1a231 100644 --- a/src/lib/corelib/buildgraph/artifactcleaner.cpp +++ b/src/lib/corelib/buildgraph/artifactcleaner.cpp @@ -52,12 +52,12 @@ #include <tools/progressobserver.h> #include <tools/qbsassert.h> -#include <QCoreApplication> -#include <QDir> -#include <QDirIterator> -#include <QFileInfo> -#include <QSet> -#include <QString> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/artifactcleaner.h b/src/lib/corelib/buildgraph/artifactcleaner.h index 510a74678..34be4e0f4 100644 --- a/src/lib/corelib/buildgraph/artifactcleaner.h +++ b/src/lib/corelib/buildgraph/artifactcleaner.h @@ -39,7 +39,7 @@ #ifndef QBS_ARTIFACTCLEANER_H #define QBS_ARTIFACTCLEANER_H -#include <QList> +#include <QtCore/qlist.h> #include <language/forward_decls.h> #include <logging/logger.h> diff --git a/src/lib/corelib/buildgraph/artifactset.h b/src/lib/corelib/buildgraph/artifactset.h index 851405b87..953b0024e 100644 --- a/src/lib/corelib/buildgraph/artifactset.h +++ b/src/lib/corelib/buildgraph/artifactset.h @@ -40,8 +40,8 @@ #ifndef QBS_ARTIFACTSET_H #define QBS_ARTIFACTSET_H -#include <QStringList> -#include <QVector> +#include <QtCore/qstringlist.h> +#include <QtCore/qvector.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/artifactvisitor.h b/src/lib/corelib/buildgraph/artifactvisitor.h index e0b68d9e2..ad4175cf8 100644 --- a/src/lib/corelib/buildgraph/artifactvisitor.h +++ b/src/lib/corelib/buildgraph/artifactvisitor.h @@ -44,8 +44,8 @@ #include "buildgraphvisitor.h" #include <language/forward_decls.h> -#include <QList> -#include <QSet> +#include <QtCore/qlist.h> +#include <QtCore/qset.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index 36e660d8a..7c301c789 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -58,9 +58,9 @@ #include <tools/scripttools.h> #include <tools/qbsassert.h> -#include <QDir> -#include <QFile> -#include <QFileInfo> +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> #include <algorithm> diff --git a/src/lib/corelib/buildgraph/buildgraph.h b/src/lib/corelib/buildgraph/buildgraph.h index 155dfe060..1d127af30 100644 --- a/src/lib/corelib/buildgraph/buildgraph.h +++ b/src/lib/corelib/buildgraph/buildgraph.h @@ -42,8 +42,9 @@ #include "forward_decls.h" #include <language/forward_decls.h> -#include <QScriptValue> -#include <QStringList> +#include <QtCore/qstringlist.h> + +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index 70b2a3a8d..3d536c72d 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -60,8 +60,8 @@ #include <tools/profiling.h> #include <tools/qbsassert.h> -#include <QDir> -#include <QFileInfo> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> #include <algorithm> diff --git a/src/lib/corelib/buildgraph/buildgraphloader.h b/src/lib/corelib/buildgraph/buildgraphloader.h index 47525f042..5d66bd0a1 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.h +++ b/src/lib/corelib/buildgraph/buildgraphloader.h @@ -48,8 +48,8 @@ #include <logging/logger.h> #include <tools/setupprojectparameters.h> -#include <QProcessEnvironment> -#include <QVariantMap> +#include <QtCore/qprocess.h> +#include <QtCore/qvariant.h> namespace qbs { diff --git a/src/lib/corelib/buildgraph/buildgraphnode.cpp b/src/lib/corelib/buildgraph/buildgraphnode.cpp index 458e8845a..e0e88abd8 100644 --- a/src/lib/corelib/buildgraph/buildgraphnode.cpp +++ b/src/lib/corelib/buildgraph/buildgraphnode.cpp @@ -46,8 +46,6 @@ #include <tools/error.h> #include <tools/qbsassert.h> -//#include <qglobal.h> - namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/command.cpp b/src/lib/corelib/buildgraph/command.cpp index 73aa7efce..d1d26f7a4 100644 --- a/src/lib/corelib/buildgraph/command.cpp +++ b/src/lib/corelib/buildgraph/command.cpp @@ -44,10 +44,11 @@ #include <tools/persistence.h> #include <tools/qbsassert.h> -#include <QFile> -#include <QScriptEngine> -#include <QScriptValueIterator> -#include <QSet> +#include <QtCore/qfile.h> +#include <QtCore/qset.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalueiterator.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/command.h b/src/lib/corelib/buildgraph/command.h index 79bc9f182..3d6d86771 100644 --- a/src/lib/corelib/buildgraph/command.h +++ b/src/lib/corelib/buildgraph/command.h @@ -45,11 +45,12 @@ #include <tools/codelocation.h> #include <tools/persistentobject.h> -#include <QProcessEnvironment> -#include <QSet> -#include <QStringList> -#include <QVariantMap> -#include <QScriptValue> +#include <QtCore/qprocess.h> +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/cycledetector.h b/src/lib/corelib/buildgraph/cycledetector.h index da844d359..a4ebef215 100644 --- a/src/lib/corelib/buildgraph/cycledetector.h +++ b/src/lib/corelib/buildgraph/cycledetector.h @@ -43,7 +43,7 @@ #include <language/forward_decls.h> #include <logging/logger.h> -#include <QSet> +#include <QtCore/qset.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp index c5a94a838..a05ee8380 100644 --- a/src/lib/corelib/buildgraph/depscanner.cpp +++ b/src/lib/corelib/buildgraph/depscanner.cpp @@ -51,9 +51,10 @@ #include <plugins/scanner/scanner.h> #include <tools/fileinfo.h> -#include <QVariantMap> -#include <QSet> -#include <QScriptContext> +#include <QtCore/qvariant.h> +#include <QtCore/qset.h> + +#include <QtScript/qscriptcontext.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/depscanner.h b/src/lib/corelib/buildgraph/depscanner.h index e0fe52028..cf614c1a6 100644 --- a/src/lib/corelib/buildgraph/depscanner.h +++ b/src/lib/corelib/buildgraph/depscanner.h @@ -44,8 +44,9 @@ #include <language/filetags.h> #include <language/preparescriptobserver.h> -#include <QStringList> -#include <QScriptValue> +#include <QtCore/qstringlist.h> + +#include <QtScript/qscriptvalue.h> class ScannerPlugin; diff --git a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp index 3f96cf35d..fc62953bc 100644 --- a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp +++ b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp @@ -42,8 +42,8 @@ #include <language/language.h> -#include <QDir> -#include <QFileInfo> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/emptydirectoriesremover.h b/src/lib/corelib/buildgraph/emptydirectoriesremover.h index 518da32cd..a7f3ebd64 100644 --- a/src/lib/corelib/buildgraph/emptydirectoriesremover.h +++ b/src/lib/corelib/buildgraph/emptydirectoriesremover.h @@ -41,8 +41,8 @@ #include <logging/logger.h> -#include <QSet> -#include <QStringList> +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index a763e83bf..e0e7534a0 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -62,10 +62,10 @@ #include <tools/progressobserver.h> #include <tools/qbsassert.h> -#include <QDir> -#include <QPair> -#include <QSet> -#include <QTimer> +#include <QtCore/qdir.h> +#include <QtCore/qpair.h> +#include <QtCore/qset.h> +#include <QtCore/qtimer.h> #include <algorithm> #include <climits> diff --git a/src/lib/corelib/buildgraph/executor.h b/src/lib/corelib/buildgraph/executor.h index a15e0e2ac..f55ca5a53 100644 --- a/src/lib/corelib/buildgraph/executor.h +++ b/src/lib/corelib/buildgraph/executor.h @@ -50,7 +50,7 @@ #include <tools/buildoptions.h> #include <tools/error.h> -#include <QObject> +#include <QtCore/qobject.h> #include <queue> QT_BEGIN_NAMESPACE diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp index 5586e75fa..90b93cf8e 100644 --- a/src/lib/corelib/buildgraph/executorjob.cpp +++ b/src/lib/corelib/buildgraph/executorjob.cpp @@ -48,7 +48,7 @@ #include <tools/error.h> #include <tools/qbsassert.h> -#include <QThread> +#include <QtCore/qthread.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/executorjob.h b/src/lib/corelib/buildgraph/executorjob.h index b5a76c23a..b1701a11d 100644 --- a/src/lib/corelib/buildgraph/executorjob.h +++ b/src/lib/corelib/buildgraph/executorjob.h @@ -44,7 +44,7 @@ #include <tools/commandechomode.h> #include <tools/error.h> -#include <QObject> +#include <QtCore/qobject.h> namespace qbs { class CodeLocation; diff --git a/src/lib/corelib/buildgraph/forward_decls.h b/src/lib/corelib/buildgraph/forward_decls.h index 5c8f31206..96beb3e15 100644 --- a/src/lib/corelib/buildgraph/forward_decls.h +++ b/src/lib/corelib/buildgraph/forward_decls.h @@ -39,7 +39,7 @@ #ifndef QBS_BG_FORWARD_DECLS_H #define QBS_BG_FORWARD_DECLS_H -#include <QSharedPointer> +#include <QtCore/qsharedpointer.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index a505d3b21..bcb890bfe 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -53,10 +53,10 @@ #include <tools/qbsassert.h> #include <tools/error.h> -#include <QDir> -#include <QSet> -#include <QStringList> -#include <QVariantMap> +#include <QtCore/qdir.h> +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.h b/src/lib/corelib/buildgraph/inputartifactscanner.h index ec56f5f9a..de2ce6718 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.h +++ b/src/lib/corelib/buildgraph/inputartifactscanner.h @@ -44,8 +44,8 @@ #include <language/forward_decls.h> #include <logging/logger.h> -#include <QHash> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> class ScannerPlugin; diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp index 3fdebc436..cff46f128 100644 --- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp @@ -52,9 +52,9 @@ #include <tools/error.h> #include <tools/qbsassert.h> -#include <QEventLoop> -#include <QThread> -#include <QTimer> +#include <QtCore/qeventloop.h> +#include <QtCore/qthread.h> +#include <QtCore/qtimer.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.h b/src/lib/corelib/buildgraph/jscommandexecutor.h index 2229f7606..929c81fff 100644 --- a/src/lib/corelib/buildgraph/jscommandexecutor.h +++ b/src/lib/corelib/buildgraph/jscommandexecutor.h @@ -42,7 +42,7 @@ #include "abstractcommandexecutor.h" -#include <QString> +#include <QtCore/qstring.h> namespace qbs { class CodeLocation; diff --git a/src/lib/corelib/buildgraph/nodeset.h b/src/lib/corelib/buildgraph/nodeset.h index 32262e087..3d736fab1 100644 --- a/src/lib/corelib/buildgraph/nodeset.h +++ b/src/lib/corelib/buildgraph/nodeset.h @@ -40,7 +40,7 @@ #ifndef QBS_NODESET_H #define QBS_NODESET_H -#include <QVector> +#include <QtCore/qvector.h> #include <iterator> diff --git a/src/lib/corelib/buildgraph/nodetreedumper.cpp b/src/lib/corelib/buildgraph/nodetreedumper.cpp index f77e79c58..686c38fd1 100644 --- a/src/lib/corelib/buildgraph/nodetreedumper.cpp +++ b/src/lib/corelib/buildgraph/nodetreedumper.cpp @@ -46,7 +46,7 @@ #include <language/language.h> #include <tools/qbsassert.h> -#include <QIODevice> +#include <QtCore/qiodevice.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/nodetreedumper.h b/src/lib/corelib/buildgraph/nodetreedumper.h index 86d14e726..47aade11b 100644 --- a/src/lib/corelib/buildgraph/nodetreedumper.h +++ b/src/lib/corelib/buildgraph/nodetreedumper.h @@ -43,7 +43,7 @@ #include "buildgraphvisitor.h" #include <language/forward_decls.h> -#include <QList> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp index 49c2cf2f0..b882c8f14 100644 --- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp @@ -58,11 +58,12 @@ #include <tools/scripttools.h> #include <tools/shellutils.h> -#include <QDir> -#include <QScriptEngine> -#include <QScriptValue> -#include <QTemporaryFile> -#include <QTimer> +#include <QtCore/qdir.h> +#include <QtCore/qtemporaryfile.h> +#include <QtCore/qtimer.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.h b/src/lib/corelib/buildgraph/processcommandexecutor.h index 89bc03af8..d04f305c3 100644 --- a/src/lib/corelib/buildgraph/processcommandexecutor.h +++ b/src/lib/corelib/buildgraph/processcommandexecutor.h @@ -42,9 +42,9 @@ #include "abstractcommandexecutor.h" -#include <QProcess> -#include <QProcessEnvironment> -#include <QString> +#include <QtCore/qprocess.h> +#include <QtCore/qprocess.h> +#include <QtCore/qstring.h> namespace qbs { class ProcessResult; diff --git a/src/lib/corelib/buildgraph/productbuilddata.h b/src/lib/corelib/buildgraph/productbuilddata.h index 80f892078..84ab5ab75 100644 --- a/src/lib/corelib/buildgraph/productbuilddata.h +++ b/src/lib/corelib/buildgraph/productbuilddata.h @@ -46,8 +46,8 @@ #include <language/forward_decls.h> #include <tools/persistentobject.h> -#include <QList> -#include <QSet> +#include <QtCore/qlist.h> +#include <QtCore/qset.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp index 620ae5bd5..fef34ddbf 100644 --- a/src/lib/corelib/buildgraph/productinstaller.cpp +++ b/src/lib/corelib/buildgraph/productinstaller.cpp @@ -51,8 +51,8 @@ #include <tools/progressobserver.h> #include <tools/qbsassert.h> -#include <QDir> -#include <QFileInfo> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/productinstaller.h b/src/lib/corelib/buildgraph/productinstaller.h index 12ae69a0b..b7bf9e3fe 100644 --- a/src/lib/corelib/buildgraph/productinstaller.h +++ b/src/lib/corelib/buildgraph/productinstaller.h @@ -45,8 +45,8 @@ #include <logging/logger.h> #include <tools/installoptions.h> -#include <QHash> -#include <QList> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/projectbuilddata.h b/src/lib/corelib/buildgraph/projectbuilddata.h index 091263850..7ac4b005b 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.h +++ b/src/lib/corelib/buildgraph/projectbuilddata.h @@ -44,11 +44,12 @@ #include <logging/logger.h> #include <tools/persistentobject.h> -#include <QHash> -#include <QList> -#include <QScriptValue> -#include <QSet> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> + +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/qtmocscanner.cpp b/src/lib/corelib/buildgraph/qtmocscanner.cpp index e5d5457e6..ba713ca0b 100644 --- a/src/lib/corelib/buildgraph/qtmocscanner.cpp +++ b/src/lib/corelib/buildgraph/qtmocscanner.cpp @@ -47,9 +47,10 @@ #include <tools/scannerpluginmanager.h> #include <tools/scripttools.h> -#include <QScriptContext> -#include <QScriptEngine> -#include <QDebug> +#include <QtCore/qdebug.h> + +#include <QtScript/qscriptcontext.h> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/qtmocscanner.h b/src/lib/corelib/buildgraph/qtmocscanner.h index cc457944e..3009d588b 100644 --- a/src/lib/corelib/buildgraph/qtmocscanner.h +++ b/src/lib/corelib/buildgraph/qtmocscanner.h @@ -43,9 +43,10 @@ #include <language/language.h> #include <logging/logger.h> -#include <QHash> -#include <QScriptValue> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qstring.h> + +#include <QtScript/qscriptvalue.h> QT_BEGIN_NAMESPACE class QScriptContext; diff --git a/src/lib/corelib/buildgraph/rescuableartifactdata.h b/src/lib/corelib/buildgraph/rescuableartifactdata.h index 741194cee..1a6b33cdc 100644 --- a/src/lib/corelib/buildgraph/rescuableartifactdata.h +++ b/src/lib/corelib/buildgraph/rescuableartifactdata.h @@ -47,8 +47,8 @@ #include <language/property.h> #include <tools/filetime.h> -#include <QHash> -#include <QList> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/rulegraph.h b/src/lib/corelib/buildgraph/rulegraph.h index b29abeb21..7590a75ec 100644 --- a/src/lib/corelib/buildgraph/rulegraph.h +++ b/src/lib/corelib/buildgraph/rulegraph.h @@ -43,11 +43,11 @@ #include <language/filetags.h> #include <language/forward_decls.h> -#include <QList> -#include <QMap> -#include <QSet> -#include <QString> -#include <QVector> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> +#include <QtCore/qvector.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 7b062f4c9..20f8c2e1d 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -60,10 +60,11 @@ #include <tools/scripttools.h> #include <tools/qbsassert.h> -#include <QDir> -#include <QQueue> -#include <QScopedPointer> -#include <QScriptValueIterator> +#include <QtCore/qdir.h> +#include <QtCore/qqueue.h> +#include <QtCore/qscopedpointer.h> + +#include <QtScript/qscriptvalueiterator.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/rulesapplicator.h b/src/lib/corelib/buildgraph/rulesapplicator.h index 665501953..51462bbfe 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.h +++ b/src/lib/corelib/buildgraph/rulesapplicator.h @@ -46,9 +46,10 @@ #include <language/forward_decls.h> #include <logging/logger.h> -#include <QHash> -#include <QScriptValue> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qstring.h> + +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp index efbb6b652..ad8c862e3 100644 --- a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp +++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp @@ -49,7 +49,7 @@ #include <tools/progressobserver.h> #include <tools/qbsassert.h> -#include <QVariant> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.h b/src/lib/corelib/buildgraph/rulesevaluationcontext.h index db475296a..69669ed24 100644 --- a/src/lib/corelib/buildgraph/rulesevaluationcontext.h +++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.h @@ -42,10 +42,11 @@ #include <language/forward_decls.h> #include <logging/logger.h> -#include <QHash> -#include <QScriptProgram> -#include <QScriptValue> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qstring.h> + +#include <QtScript/qscriptprogram.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/scanresultcache.h b/src/lib/corelib/buildgraph/scanresultcache.h index f01431047..82a326933 100644 --- a/src/lib/corelib/buildgraph/scanresultcache.h +++ b/src/lib/corelib/buildgraph/scanresultcache.h @@ -42,9 +42,9 @@ #include <language/filetags.h> -#include <QHash> -#include <QString> -#include <QVector> +#include <QtCore/qhash.h> +#include <QtCore/qstring.h> +#include <QtCore/qvector.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/timestampsupdater.cpp b/src/lib/corelib/buildgraph/timestampsupdater.cpp index 4af716a2f..7fefd60d3 100644 --- a/src/lib/corelib/buildgraph/timestampsupdater.cpp +++ b/src/lib/corelib/buildgraph/timestampsupdater.cpp @@ -48,7 +48,7 @@ #include <tools/filetime.h> #include <tools/qbsassert.h> -#include <QFile> +#include <QtCore/qfile.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/timestampsupdater.h b/src/lib/corelib/buildgraph/timestampsupdater.h index cc92f0e40..cfe20df12 100644 --- a/src/lib/corelib/buildgraph/timestampsupdater.h +++ b/src/lib/corelib/buildgraph/timestampsupdater.h @@ -41,7 +41,7 @@ #include <language/forward_decls.h> -#include <QList> +#include <QtCore/qlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index ecd522425..433f0e161 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -51,7 +51,7 @@ #include <tools/scripttools.h> #include <tools/qbsassert.h> -#include <QDir> +#include <QtCore/qdir.h> #include <algorithm> diff --git a/src/lib/corelib/buildgraph/transformer.h b/src/lib/corelib/buildgraph/transformer.h index 844ffc425..6c44e939f 100644 --- a/src/lib/corelib/buildgraph/transformer.h +++ b/src/lib/corelib/buildgraph/transformer.h @@ -46,8 +46,9 @@ #include <language/property.h> #include <tools/persistentobject.h> -#include <QHash> -#include <QScriptEngine> +#include <QtCore/qhash.h> + +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/tst_buildgraph.cpp b/src/lib/corelib/buildgraph/tst_buildgraph.cpp index f23ffa2d4..9cc502cf4 100644 --- a/src/lib/corelib/buildgraph/tst_buildgraph.cpp +++ b/src/lib/corelib/buildgraph/tst_buildgraph.cpp @@ -47,7 +47,7 @@ #include <logging/logger.h> #include <tools/error.h> -#include <QtTest> +#include <QtTest/qtest.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/buildgraph/tst_buildgraph.h b/src/lib/corelib/buildgraph/tst_buildgraph.h index 38e112722..e33037b30 100644 --- a/src/lib/corelib/buildgraph/tst_buildgraph.h +++ b/src/lib/corelib/buildgraph/tst_buildgraph.h @@ -44,8 +44,8 @@ #include <logging/ilogsink.h> #include <tools/qbs_export.h> -#include <QList> -#include <QObject> +#include <QtCore/qlist.h> +#include <QtCore/qobject.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp index 6d8b8a5ed..a3407cb09 100644 --- a/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp +++ b/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp @@ -46,11 +46,11 @@ #include <tools/installoptions.h> #include <tools/shellutils.h> -#include <QDir> -#include <QFile> -#include <QJsonArray> -#include <QJsonDocument> -#include <QJsonObject> +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qjsonarray.h> +#include <QtCore/qjsondocument.h> +#include <QtCore/qjsonobject.h> namespace qbs { using namespace Internal; diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp index e167d7820..6459eb1c7 100644 --- a/src/lib/corelib/generators/generator.cpp +++ b/src/lib/corelib/generators/generator.cpp @@ -42,7 +42,7 @@ #include <tools/hostosinfo.h> #include <tools/installoptions.h> #include <tools/qbsassert.h> -#include <QCoreApplication> +#include <QtCore/qcoreapplication.h> namespace qbs { diff --git a/src/lib/corelib/generators/generator.h b/src/lib/corelib/generators/generator.h index 366627800..5e62f27aa 100644 --- a/src/lib/corelib/generators/generator.h +++ b/src/lib/corelib/generators/generator.h @@ -42,8 +42,8 @@ #define GENERATORPLUGIN_H #include "generatordata.h" -#include <QList> -#include <QString> +#include <QtCore/qlist.h> +#include <QtCore/qstring.h> namespace qbs { diff --git a/src/lib/corelib/generators/generatordata.cpp b/src/lib/corelib/generators/generatordata.cpp index 27341d19e..47178bca3 100644 --- a/src/lib/corelib/generators/generatordata.cpp +++ b/src/lib/corelib/generators/generatordata.cpp @@ -40,7 +40,7 @@ #include "generatordata.h" #include <tools/error.h> -#include <QDir> +#include <QtCore/qdir.h> namespace qbs { diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h index b60e84b0e..1a1371cb3 100644 --- a/src/lib/corelib/generators/generatordata.h +++ b/src/lib/corelib/generators/generatordata.h @@ -40,8 +40,8 @@ #ifndef GENERATORDATA_H #define GENERATORDATA_H -#include <QDir> -#include <QMap> +#include <QtCore/qdir.h> +#include <QtCore/qmap.h> #include <api/project.h> #include <api/projectdata.h> diff --git a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp index 0ca7c16ed..f912f3a19 100644 --- a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp +++ b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp @@ -41,7 +41,7 @@ #include "../msbuild/msbuildproperty.h" #include "../msbuild/msbuildpropertygroup.h" -#include <QXmlStreamWriter> +#include <QtCore/qxmlstream.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h index f2a9a9913..c70889971 100644 --- a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h +++ b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h @@ -31,7 +31,7 @@ #ifndef MSBUILDPROJECTWRITER_H #define MSBUILDPROJECTWRITER_H -#include <QIODevice> +#include <QtCore/qiodevice.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp index 4e786aa55..0621fe97c 100644 --- a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp +++ b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp @@ -39,12 +39,12 @@ #include <tools/pathutils.h> #include <tools/visualstudioversioninfo.h> -#include <QDir> -#include <QFile> -#include <QFileInfo> -#include <QTextStream> -#include <QUuid> -#include <QVector> +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qtextstream.h> +#include <QtCore/quuid.h> +#include <QtCore/qvector.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h index 2f3c02085..d5b0107f0 100644 --- a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h +++ b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h @@ -31,8 +31,8 @@ #ifndef VISUALSTUDIOSOLUTIONWRITER_H #define VISUALSTUDIOSOLUTIONWRITER_H -#include <QIODevice> -#include <QScopedPointer> +#include <QtCore/qiodevice.h> +#include <QtCore/qscopedpointer.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h index 561cd9403..4d2436e52 100644 --- a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h +++ b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h @@ -31,8 +31,8 @@ #ifndef IMSBUILDGROUP_H #define IMSBUILDGROUP_H -#include <QObject> -#include <QScopedPointer> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h index 512bedf36..a1a7676e6 100644 --- a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h +++ b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h @@ -31,9 +31,9 @@ #ifndef IMSBUILDPROPERTY_H #define IMSBUILDPROPERTY_H -#include <QObject> -#include <QScopedPointer> -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qvariant.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp b/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp index 0885f710c..3a5d98a98 100644 --- a/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp @@ -31,7 +31,7 @@ #include "msbuildfilter.h" #include "../msbuilditemmetadata.h" #include <tools/hostosinfo.h> -#include <QUuid> +#include <QtCore/quuid.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h b/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h index 4f86761b0..352616e1b 100644 --- a/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h +++ b/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h @@ -30,7 +30,7 @@ #ifndef MSBUILDIMPORT_H #define MSBUILDIMPORT_H -#include <QObject> +#include <QtCore/qobject.h> #include "imsbuildnode.h" namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h b/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h index 1314c15ac..ca411c715 100644 --- a/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h +++ b/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h @@ -31,7 +31,7 @@ #ifndef MSBUILDITEM_H #define MSBUILDITEM_H -#include <QObject> +#include <QtCore/qobject.h> #include "imsbuildnode.h" namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h b/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h index 23b5a682c..fc1a0f1f4 100644 --- a/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h +++ b/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h @@ -31,7 +31,7 @@ #ifndef MSBUILDPROJECT_H #define MSBUILDPROJECT_H -#include <QObject> +#include <QtCore/qobject.h> #include "imsbuildnode.h" namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp index 1eceb004b..22bc72841 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp @@ -37,8 +37,8 @@ #include "msbuild/items/msbuildfilter.h" #include "msbuild/items/msbuildnone.h" -#include <QFileInfo> -#include <QVector> +#include <QtCore/qfileinfo.h> +#include <QtCore/qvector.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp index bdbb0fe73..51c72ecd3 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp @@ -36,7 +36,7 @@ #include <tools/hostosinfo.h> #include <tools/shellutils.h> -#include <QUuid> +#include <QtCore/quuid.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp index d51534159..f65dd8994 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp @@ -50,8 +50,8 @@ #include <tools/shellutils.h> #include <tools/version.h> -#include <QDir> -#include <QUuid> +#include <QtCore/qdir.h> +#include <QtCore/quuid.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp index cbf0d430d..bf7c4fcbf 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp @@ -35,7 +35,7 @@ #include <tools/pathutils.h> #include <tools/shellutils.h> -#include <QFileInfo> +#include <QtCore/qfileinfo.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp index 5cc1eb633..49d463ef0 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp @@ -34,7 +34,7 @@ #include <tools/pathutils.h> -#include <QFileInfo> +#include <QtCore/qfileinfo.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h index 6e70ed464..fcbe9f114 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h +++ b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h @@ -36,7 +36,7 @@ #include <generators/generatordata.h> #include <tools/visualstudioversioninfo.h> -#include <QFileInfo> +#include <QtCore/qfileinfo.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h b/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h index c7089e955..17de66e73 100644 --- a/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h +++ b/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h @@ -31,10 +31,10 @@ #ifndef IVISUALSTUDIOSOLUTIONPROJECT_H #define IVISUALSTUDIOSOLUTIONPROJECT_H -#include <QObject> -#include <QScopedPointer> -#include <QString> -#include <QUuid> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstring.h> +#include <QtCore/quuid.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp index db2946ed9..a6d572425 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp @@ -35,7 +35,7 @@ #include <tools/visualstudioversioninfo.h> -#include <QMap> +#include <QtCore/qmap.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h index 7769a9d11..16f06f9e9 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h @@ -31,8 +31,8 @@ #ifndef VISUALSTUDIOSOLUTION_H #define VISUALSTUDIOSOLUTION_H -#include <QObject> -#include <QScopedPointer> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp index 3be759542..d66f47cf7 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp @@ -30,7 +30,7 @@ #include "visualstudiosolutionfileproject.h" -#include <QFileInfo> +#include <QtCore/qfileinfo.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h index b0dc63eed..fafafa494 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h @@ -31,7 +31,7 @@ #ifndef VISUALSTUDIOSOLUTIONFILEPROJECT_H #define VISUALSTUDIOSOLUTIONFILEPROJECT_H -#include <QObject> +#include <QtCore/qobject.h> #include "ivisualstudiosolutionproject.h" namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp index 1ad2dd9b1..d59d1e1ed 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp @@ -30,7 +30,7 @@ #include "visualstudiosolutionfolderproject.h" -#include <QFileInfo> +#include <QtCore/qfileinfo.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h index 967e5f4dd..a7fd180cc 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h @@ -31,7 +31,7 @@ #ifndef VISUALSTUDIOSOLUTIONFOLDERPROJECT_H #define VISUALSTUDIOSOLUTIONFOLDERPROJECT_H -#include <QObject> +#include <QtCore/qobject.h> #include "ivisualstudiosolutionproject.h" namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp index 4fc4d07f8..117eadc82 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp @@ -29,8 +29,8 @@ ****************************************************************************/ #include "visualstudiosolutionglobalsection.h" -#include <QPair> -#include <QVector> +#include <QtCore/qpair.h> +#include <QtCore/qvector.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h index 8795253d1..9c0bf950c 100644 --- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h +++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h @@ -31,8 +31,8 @@ #ifndef VISUALSTUDIOSOLUTIONGLOBALSECTION_H #define VISUALSTUDIOSOLUTIONGLOBALSECTION_H -#include <QObject> -#include <QScopedPointer> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp index dd2f66e05..eb49c9c5b 100644 --- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp +++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp @@ -55,11 +55,11 @@ #include <tools/shellutils.h> #include <tools/visualstudioversioninfo.h> -#include <QCoreApplication> -#include <QDebug> -#include <QDir> -#include <QFile> -#include <QFileInfo> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdebug.h> +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h index 1dc13db04..43c6709a7 100644 --- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h +++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h @@ -36,9 +36,9 @@ #include <tools/visualstudioversioninfo.h> #include "visualstudioguidpool.h" -#include <QFileInfo> -#include <QDir> -#include <QMap> +#include <QtCore/qfileinfo.h> +#include <QtCore/qdir.h> +#include <QtCore/qmap.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp index 40e61010b..543d64063 100644 --- a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp +++ b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp @@ -30,10 +30,10 @@ #include "visualstudioguidpool.h" #include <tools/filesaver.h> -#include <QFile> -#include <QJsonDocument> -#include <QMap> -#include <QVariant> +#include <QtCore/qfile.h> +#include <QtCore/qjsondocument.h> +#include <QtCore/qmap.h> +#include <QtCore/qvariant.h> namespace qbs { diff --git a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h index d5e46790a..a21bb1f94 100644 --- a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h +++ b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h @@ -31,9 +31,9 @@ #ifndef VISUALSTUDIOGUIDPOOL_H #define VISUALSTUDIOGUIDPOOL_H -#include <QObject> -#include <QScopedPointer> -#include <QUuid> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/quuid.h> namespace qbs { diff --git a/src/lib/corelib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp index e3f178fd8..9547f717a 100644 --- a/src/lib/corelib/jsextensions/domxml.cpp +++ b/src/lib/corelib/jsextensions/domxml.cpp @@ -39,9 +39,9 @@ #include "domxml.h" -#include <QFile> -#include <QScriptEngine> +#include <QtCore/qfile.h> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/domxml.h b/src/lib/corelib/jsextensions/domxml.h index e9f61a4f0..1539f829b 100644 --- a/src/lib/corelib/jsextensions/domxml.h +++ b/src/lib/corelib/jsextensions/domxml.h @@ -41,12 +41,13 @@ #ifndef DOMXML_H #define DOMXML_H -#include <QDomDocument> -#include <QDomNode> -#include <QObject> -#include <QScriptValue> -#include <QScriptable> -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptvalue.h> +#include <QtScript/qscriptable.h> + +#include <QtXml/qdom.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/environmentextension.cpp b/src/lib/corelib/jsextensions/environmentextension.cpp index 91f98fe29..a7d26fb03 100644 --- a/src/lib/corelib/jsextensions/environmentextension.cpp +++ b/src/lib/corelib/jsextensions/environmentextension.cpp @@ -43,11 +43,12 @@ #include <logging/translator.h> #include <tools/fileinfo.h> -#include <QDir> -#include <QFileInfo> -#include <QRegularExpression> -#include <QScriptable> -#include <QScriptEngine> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qregularexpression.h> + +#include <QtScript/qscriptable.h> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/environmentextension.h b/src/lib/corelib/jsextensions/environmentextension.h index a9faf1a59..2366971d5 100644 --- a/src/lib/corelib/jsextensions/environmentextension.h +++ b/src/lib/corelib/jsextensions/environmentextension.h @@ -40,7 +40,7 @@ #ifndef QBS_ENVIRONMENTEXTENSION_H #define QBS_ENVIRONMENTEXTENSION_H -#include <QScriptValue> +#include <QtScript/qscriptvalue.h> QT_BEGIN_NAMESPACE class QScriptContext; diff --git a/src/lib/corelib/jsextensions/file.cpp b/src/lib/corelib/jsextensions/file.cpp index 90dae1d4c..87b807c02 100644 --- a/src/lib/corelib/jsextensions/file.cpp +++ b/src/lib/corelib/jsextensions/file.cpp @@ -43,10 +43,11 @@ #include <logging/translator.h> #include <tools/fileinfo.h> -#include <QDir> -#include <QFileInfo> -#include <QScriptable> -#include <QScriptEngine> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> + +#include <QtScript/qscriptable.h> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/file.h b/src/lib/corelib/jsextensions/file.h index f81eb82b2..677992d0f 100644 --- a/src/lib/corelib/jsextensions/file.h +++ b/src/lib/corelib/jsextensions/file.h @@ -40,8 +40,8 @@ #ifndef QBS_FILE_H #define QBS_FILE_H -#include <QScriptContext> -#include <QScriptValue> +#include <QtScript/qscriptcontext.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/fileinfoextension.cpp b/src/lib/corelib/jsextensions/fileinfoextension.cpp index 1c8a12cc5..2c2be692b 100644 --- a/src/lib/corelib/jsextensions/fileinfoextension.cpp +++ b/src/lib/corelib/jsextensions/fileinfoextension.cpp @@ -43,11 +43,12 @@ #include <logging/translator.h> #include <tools/fileinfo.h> -#include <QDir> -#include <QFileInfo> -#include <QRegularExpression> -#include <QScriptable> -#include <QScriptEngine> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qregularexpression.h> + +#include <QtScript/qscriptable.h> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/fileinfoextension.h b/src/lib/corelib/jsextensions/fileinfoextension.h index 9a1baa5b1..3ede2a79f 100644 --- a/src/lib/corelib/jsextensions/fileinfoextension.h +++ b/src/lib/corelib/jsextensions/fileinfoextension.h @@ -40,7 +40,7 @@ #ifndef QBS_FILEINFOEXTENSION_H #define QBS_FILEINFOEXTENSION_H -#include <QScriptValue> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/jsextensions.cpp b/src/lib/corelib/jsextensions/jsextensions.cpp index 886998a2b..7153ddb75 100644 --- a/src/lib/corelib/jsextensions/jsextensions.cpp +++ b/src/lib/corelib/jsextensions/jsextensions.cpp @@ -49,7 +49,7 @@ #include "textfile.h" #include "utilitiesextension.h" -#include <QScriptEngine> +#include <QtScript/qscriptengine.h> #include <utility> diff --git a/src/lib/corelib/jsextensions/jsextensions.h b/src/lib/corelib/jsextensions/jsextensions.h index 52a1dbb05..1ff25a659 100644 --- a/src/lib/corelib/jsextensions/jsextensions.h +++ b/src/lib/corelib/jsextensions/jsextensions.h @@ -40,8 +40,8 @@ #ifndef QBS_JSEXTENSIONS_H #define QBS_JSEXTENSIONS_H -#include <QHash> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index b8477fe7b..15fc7c6ef 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -46,7 +46,7 @@ #include <logging/translator.h> #include <tools/error.h> -#include <QScriptEngine> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/moduleproperties.h b/src/lib/corelib/jsextensions/moduleproperties.h index ab6e55bb2..7994a869c 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.h +++ b/src/lib/corelib/jsextensions/moduleproperties.h @@ -43,8 +43,8 @@ #include <buildgraph/forward_decls.h> #include <language/forward_decls.h> -#include <QScriptContext> -#include <QScriptValue> +#include <QtScript/qscriptcontext.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp index ab4df57b8..6f493db7d 100644 --- a/src/lib/corelib/jsextensions/process.cpp +++ b/src/lib/corelib/jsextensions/process.cpp @@ -45,11 +45,12 @@ #include <tools/hostosinfo.h> #include <tools/shellutils.h> -#include <QProcess> -#include <QScriptEngine> -#include <QScriptValue> -#include <QTextCodec> -#include <QTextStream> +#include <QtCore/qprocess.h> +#include <QtCore/qtextcodec.h> +#include <QtCore/qtextstream.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/process.h b/src/lib/corelib/jsextensions/process.h index 389fbf568..85516eb5b 100644 --- a/src/lib/corelib/jsextensions/process.h +++ b/src/lib/corelib/jsextensions/process.h @@ -42,10 +42,11 @@ #include <logging/logger.h> -#include <QObject> -#include <QProcessEnvironment> -#include <QScriptable> -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qprocess.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptable.h> QT_BEGIN_NAMESPACE class QProcess; diff --git a/src/lib/corelib/jsextensions/propertylist.h b/src/lib/corelib/jsextensions/propertylist.h index 314422078..adb90f786 100644 --- a/src/lib/corelib/jsextensions/propertylist.h +++ b/src/lib/corelib/jsextensions/propertylist.h @@ -41,7 +41,7 @@ #ifndef QBS_PROPERTYLIST_H #define QBS_PROPERTYLIST_H -#include <qglobal.h> +#include <QtCore/qglobal.h> // ### remove when qbs requires qbs 1.6 to build itself #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && defined(__APPLE__) && !defined(Q_OS_MAC) @@ -50,7 +50,7 @@ #ifndef Q_OS_MAC -#include <QScriptEngine> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { @@ -68,11 +68,12 @@ void initializeJsExtensionPropertyList(QScriptValue extensionObject) #else // Q_OS_MAC -#include <QObject> -#include <QScriptable> -#include <QScriptValue> -#include <QString> -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptable.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm index 849b2dca3..508650918 100644 --- a/src/lib/corelib/jsextensions/propertylist.mm +++ b/src/lib/corelib/jsextensions/propertylist.mm @@ -43,10 +43,11 @@ #include <language/scriptengine.h> #include <tools/hostosinfo.h> -#include <QFile> -#include <QScriptEngine> -#include <QScriptValue> -#include <QTextStream> +#include <QtCore/qfile.h> +#include <QtCore/qtextstream.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> // Same values as CoreFoundation and Foundation APIs enum { diff --git a/src/lib/corelib/jsextensions/propertylistutils.h b/src/lib/corelib/jsextensions/propertylistutils.h index c02e04f15..0fd9832c9 100644 --- a/src/lib/corelib/jsextensions/propertylistutils.h +++ b/src/lib/corelib/jsextensions/propertylistutils.h @@ -41,7 +41,7 @@ #ifndef QPROPERTYLISTUTILS_H #define QPROPERTYLISTUTILS_H -#include <QVariant> +#include <QtCore/qvariant.h> #import <Foundation/Foundation.h> #if !defined(__OBJC__) || !defined(__cplusplus) diff --git a/src/lib/corelib/jsextensions/propertylistutils.mm b/src/lib/corelib/jsextensions/propertylistutils.mm index f0587cf4e..a8cda4d12 100644 --- a/src/lib/corelib/jsextensions/propertylistutils.mm +++ b/src/lib/corelib/jsextensions/propertylistutils.mm @@ -40,10 +40,10 @@ #import <Foundation/Foundation.h> #include "propertylistutils.h" -#include <QByteArray> -#include <QDateTime> -#include <QString> -#include <QVariantMap> +#include <QtCore/qbytearray.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> static inline QDateTime QDateTime_fromNSDate(const NSDate *date) { diff --git a/src/lib/corelib/jsextensions/temporarydir.cpp b/src/lib/corelib/jsextensions/temporarydir.cpp index e7b811f31..68eafec3e 100644 --- a/src/lib/corelib/jsextensions/temporarydir.cpp +++ b/src/lib/corelib/jsextensions/temporarydir.cpp @@ -42,9 +42,10 @@ #include <language/scriptengine.h> -#include <QScriptEngine> -#include <QScriptValue> -#include <QTemporaryDir> +#include <QtCore/qtemporarydir.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/temporarydir.h b/src/lib/corelib/jsextensions/temporarydir.h index e56667329..32f85857e 100644 --- a/src/lib/corelib/jsextensions/temporarydir.h +++ b/src/lib/corelib/jsextensions/temporarydir.h @@ -41,10 +41,11 @@ #ifndef QBS_TEMPORARYDIR_H #define QBS_TEMPORARYDIR_H -#include <QObject> -#include <QScriptable> -#include <QTemporaryDir> -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qtemporarydir.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptable.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp index 02166c6a2..bd518b278 100644 --- a/src/lib/corelib/jsextensions/textfile.cpp +++ b/src/lib/corelib/jsextensions/textfile.cpp @@ -43,10 +43,11 @@ #include <logging/translator.h> #include <tools/hostosinfo.h> -#include <QFile> -#include <QScriptEngine> -#include <QScriptValue> -#include <QTextStream> +#include <QtCore/qfile.h> +#include <QtCore/qtextstream.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/textfile.h b/src/lib/corelib/jsextensions/textfile.h index bf898471f..547d25486 100644 --- a/src/lib/corelib/jsextensions/textfile.h +++ b/src/lib/corelib/jsextensions/textfile.h @@ -40,9 +40,10 @@ #ifndef QBS_TEXTFILE_H #define QBS_TEXTFILE_H -#include <QObject> -#include <QScriptable> -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptable.h> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp index 5155545f2..4ff6438c9 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.cpp +++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp @@ -55,12 +55,13 @@ #include <tools/vsenvironmentdetector.h> #endif -#include <QCryptographicHash> -#include <QDir> -#include <QFileInfo> -#include <QRegularExpression> -#include <QScriptable> -#include <QScriptEngine> +#include <QtCore/qcryptographichash.h> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qregularexpression.h> + +#include <QtScript/qscriptable.h> +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/jsextensions/utilitiesextension.h b/src/lib/corelib/jsextensions/utilitiesextension.h index 6afcdcf77..e1a4a23c1 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.h +++ b/src/lib/corelib/jsextensions/utilitiesextension.h @@ -40,7 +40,7 @@ #ifndef QBS_UTILITIESEXTENSION_H #define QBS_UTILITIESEXTENSION_H -#include <QScriptValue> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/astimportshandler.cpp b/src/lib/corelib/language/astimportshandler.cpp index 8ba183400..6875360f8 100644 --- a/src/lib/corelib/language/astimportshandler.cpp +++ b/src/lib/corelib/language/astimportshandler.cpp @@ -52,7 +52,7 @@ #include <tools/qttools.h> #include <tools/version.h> -#include <QDirIterator> +#include <QtCore/qdiriterator.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/astimportshandler.h b/src/lib/corelib/language/astimportshandler.h index 5a8d656c8..1f20a4189 100644 --- a/src/lib/corelib/language/astimportshandler.h +++ b/src/lib/corelib/language/astimportshandler.h @@ -43,9 +43,9 @@ #include <parser/qmljsastfwd_p.h> -#include <QHash> -#include <QSet> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> namespace qbs { class CodeLocation; diff --git a/src/lib/corelib/language/asttools.h b/src/lib/corelib/language/asttools.h index 3f3d93600..b4f5c4d98 100644 --- a/src/lib/corelib/language/asttools.h +++ b/src/lib/corelib/language/asttools.h @@ -42,7 +42,7 @@ #include <parser/qmljsastfwd_p.h> #include <tools/codelocation.h> -#include <QStringList> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp index f59edb08b..cbd399ff7 100644 --- a/src/lib/corelib/language/builtindeclarations.cpp +++ b/src/lib/corelib/language/builtindeclarations.cpp @@ -45,7 +45,7 @@ #include <tools/error.h> #include <tools/qbsassert.h> -#include <QStringList> +#include <QtCore/qstringlist.h> #include <initializer_list> #include <utility> diff --git a/src/lib/corelib/language/builtindeclarations.h b/src/lib/corelib/language/builtindeclarations.h index 0548bbd46..d85f4101a 100644 --- a/src/lib/corelib/language/builtindeclarations.h +++ b/src/lib/corelib/language/builtindeclarations.h @@ -46,9 +46,9 @@ #include <tools/codelocation.h> #include <tools/version.h> -#include <QHash> -#include <QMap> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qmap.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/deprecationinfo.h b/src/lib/corelib/language/deprecationinfo.h index c52c1f994..502715b84 100644 --- a/src/lib/corelib/language/deprecationinfo.h +++ b/src/lib/corelib/language/deprecationinfo.h @@ -41,7 +41,7 @@ #include <tools/version.h> -#include <QString> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/evaluationdata.h b/src/lib/corelib/language/evaluationdata.h index 03f47b1a3..efd504a11 100644 --- a/src/lib/corelib/language/evaluationdata.h +++ b/src/lib/corelib/language/evaluationdata.h @@ -40,10 +40,11 @@ #ifndef QBS_EVALUATIONDATA_H #define QBS_EVALUATIONDATA_H -#include <QHash> -#include <QScriptEngine> -#include <QScriptValue> -#include <QVariant> +#include <QtCore/qhash.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp index 8e4fdde5b..d768550a8 100644 --- a/src/lib/corelib/language/evaluator.cpp +++ b/src/lib/corelib/language/evaluator.cpp @@ -53,7 +53,7 @@ #include <tools/scripttools.h> #include <tools/qbsassert.h> -#include <QDebug> +#include <QtCore/qdebug.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/evaluator.h b/src/lib/corelib/language/evaluator.h index e20c0f8d9..89f08d1fc 100644 --- a/src/lib/corelib/language/evaluator.h +++ b/src/lib/corelib/language/evaluator.h @@ -44,8 +44,9 @@ #include "itemobserver.h" #include "qualifiedid.h" -#include <QHash> -#include <QScriptValue> +#include <QtCore/qhash.h> + +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index 73f7e83e2..ebfe4402f 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -55,11 +55,12 @@ #include <tools/shellutils.h> #include <jsextensions/environmentextension.h> -#include <QByteArray> -#include <QScriptString> -#include <QScriptValue> -#include <QDebug> -#include <QSettings> +#include <QtCore/qbytearray.h> +#include <QtCore/qdebug.h> +#include <QtCore/qsettings.h> + +#include <QtScript/qscriptstring.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/evaluatorscriptclass.h b/src/lib/corelib/language/evaluatorscriptclass.h index 5739f7d8b..fbf340295 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.h +++ b/src/lib/corelib/language/evaluatorscriptclass.h @@ -45,9 +45,10 @@ #include <logging/logger.h> -#include <QScriptClass> -#include <QStack> -#include <QSet> +#include <QtCore/qstack.h> +#include <QtCore/qset.h> + +#include <QtScript/qscriptclass.h> QT_BEGIN_NAMESPACE class QScriptContext; diff --git a/src/lib/corelib/language/filecontext.h b/src/lib/corelib/language/filecontext.h index 148f30084..7a0511632 100644 --- a/src/lib/corelib/language/filecontext.h +++ b/src/lib/corelib/language/filecontext.h @@ -43,7 +43,7 @@ #include "filecontextbase.h" #include "forward_decls.h" -#include <QString> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/filetags.cpp b/src/lib/corelib/language/filetags.cpp index 792b5aebb..26d997fb8 100644 --- a/src/lib/corelib/language/filetags.cpp +++ b/src/lib/corelib/language/filetags.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "filetags.h" -#include <QStringList> +#include <QtCore/qstringlist.h> #include <tools/persistence.h> diff --git a/src/lib/corelib/language/filetags.h b/src/lib/corelib/language/filetags.h index aa4bbe290..206b4fce8 100644 --- a/src/lib/corelib/language/filetags.h +++ b/src/lib/corelib/language/filetags.h @@ -42,8 +42,8 @@ #include <logging/logger.h> #include <tools/id.h> -#include <QDataStream> -#include <QSet> +#include <QtCore/qdatastream.h> +#include <QtCore/qset.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/forward_decls.h b/src/lib/corelib/language/forward_decls.h index 0c45f0090..6b09449c2 100644 --- a/src/lib/corelib/language/forward_decls.h +++ b/src/lib/corelib/language/forward_decls.h @@ -39,7 +39,7 @@ #ifndef QBS_LANG_FORWARD_DECLS_H #define QBS_LANG_FORWARD_DECLS_H -#include <QSharedPointer> +#include <QtCore/qsharedpointer.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/functiondeclaration.h b/src/lib/corelib/language/functiondeclaration.h index e737cfcf4..f014b63a4 100644 --- a/src/lib/corelib/language/functiondeclaration.h +++ b/src/lib/corelib/language/functiondeclaration.h @@ -42,7 +42,7 @@ #include <tools/codelocation.h> -#include <QString> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/identifiersearch.h b/src/lib/corelib/language/identifiersearch.h index f3e267500..999366314 100644 --- a/src/lib/corelib/language/identifiersearch.h +++ b/src/lib/corelib/language/identifiersearch.h @@ -42,8 +42,8 @@ #include <parser/qmljsastfwd_p.h> #include <parser/qmljsastvisitor_p.h> -#include <QMap> -#include <QString> +#include <QtCore/qmap.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/item.h b/src/lib/corelib/language/item.h index c2f521784..addfc8e2e 100644 --- a/src/lib/corelib/language/item.h +++ b/src/lib/corelib/language/item.h @@ -50,8 +50,8 @@ #include <tools/error.h> #include <tools/version.h> -#include <QList> -#include <QMap> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/itemdeclaration.h b/src/lib/corelib/language/itemdeclaration.h index 3d42b275a..6ad89356f 100644 --- a/src/lib/corelib/language/itemdeclaration.h +++ b/src/lib/corelib/language/itemdeclaration.h @@ -44,8 +44,8 @@ #include "itemtype.h" #include "propertydeclaration.h" -#include <QSet> -#include <QString> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/itempool.h b/src/lib/corelib/language/itempool.h index 63c94edb5..7ab62d6c1 100644 --- a/src/lib/corelib/language/itempool.h +++ b/src/lib/corelib/language/itempool.h @@ -42,7 +42,7 @@ #include <parser/qmljsmemorypool_p.h> -#include <QList> +#include <QtCore/qlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/itemreader.h b/src/lib/corelib/language/itemreader.h index 20cfc0e1e..98faa1929 100644 --- a/src/lib/corelib/language/itemreader.h +++ b/src/lib/corelib/language/itemreader.h @@ -43,9 +43,9 @@ #include "forward_decls.h" #include <logging/logger.h> -#include <QSet> -#include <QStack> -#include <QStringList> +#include <QtCore/qset.h> +#include <QtCore/qstack.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h index 96d3f9e3b..d8a4e7d8c 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.h +++ b/src/lib/corelib/language/itemreaderastvisitor.h @@ -46,8 +46,8 @@ #include <logging/logger.h> #include <parser/qmljsastvisitor_p.h> -#include <QHash> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> namespace qbs { class CodeLocation; diff --git a/src/lib/corelib/language/itemreadervisitorstate.cpp b/src/lib/corelib/language/itemreadervisitorstate.cpp index 58aec11e7..826fd2071 100644 --- a/src/lib/corelib/language/itemreadervisitorstate.cpp +++ b/src/lib/corelib/language/itemreadervisitorstate.cpp @@ -48,11 +48,11 @@ #include <parser/qmljsparser_p.h> #include <tools/error.h> -#include <QExplicitlySharedDataPointer> -#include <QFile> -#include <QFileInfo> -#include <QSharedData> -#include <QTextStream> +#include <QtCore/qshareddata.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qtextstream.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/itemreadervisitorstate.h b/src/lib/corelib/language/itemreadervisitorstate.h index 261436eb1..24ca30aa0 100644 --- a/src/lib/corelib/language/itemreadervisitorstate.h +++ b/src/lib/corelib/language/itemreadervisitorstate.h @@ -41,9 +41,9 @@ #include <logging/logger.h> -#include <QSet> -#include <QStack> -#include <QStringList> +#include <QtCore/qset.h> +#include <QtCore/qstack.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/itemtype.h b/src/lib/corelib/language/itemtype.h index ad62dddd7..a4aa8c768 100644 --- a/src/lib/corelib/language/itemtype.h +++ b/src/lib/corelib/language/itemtype.h @@ -40,7 +40,7 @@ #ifndef QBS_ITEMTYPE_H #define QBS_ITEMTYPE_H -#include <QHash> +#include <QtCore/qhash.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/jsimports.h b/src/lib/corelib/language/jsimports.h index 20c04f6c0..9802f150d 100644 --- a/src/lib/corelib/language/jsimports.h +++ b/src/lib/corelib/language/jsimports.h @@ -43,8 +43,8 @@ #include <tools/codelocation.h> #include <tools/persistence.h> -#include <QHash> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 873ef01dd..90955c207 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -60,12 +60,13 @@ #include <tools/scripttools.h> #include <tools/qbsassert.h> -#include <QCryptographicHash> -#include <QDir> -#include <QDirIterator> -#include <QMap> -#include <QMutexLocker> -#include <QScriptValue> +#include <QtCore/qcryptographichash.h> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qmap.h> +#include <QtCore/qmutex.h> + +#include <QtScript/qscriptvalue.h> #include <algorithm> diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index 5f5b8500f..34a6fef82 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -50,17 +50,18 @@ #include <tools/persistentobject.h> #include <tools/weakpointer.h> -#include <QDataStream> -#include <QHash> -#include <QMutex> -#include <QProcessEnvironment> -#include <QRegExp> -#include <QScriptValue> -#include <QScopedPointer> -#include <QSet> -#include <QString> -#include <QStringList> -#include <QVariant> +#include <QtCore/qdatastream.h> +#include <QtCore/qhash.h> +#include <QtCore/qmutex.h> +#include <QtCore/qprocess.h> +#include <QtCore/qregexp.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptvalue.h> QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/src/lib/corelib/language/loader.cpp b/src/lib/corelib/language/loader.cpp index 6a3d59c7c..4dbf379fa 100644 --- a/src/lib/corelib/language/loader.cpp +++ b/src/lib/corelib/language/loader.cpp @@ -50,9 +50,9 @@ #include <tools/qbsassert.h> #include <tools/setupprojectparameters.h> -#include <QDir> -#include <QObject> -#include <QTimer> +#include <QtCore/qdir.h> +#include <QtCore/qobject.h> +#include <QtCore/qtimer.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/loader.h b/src/lib/corelib/language/loader.h index 642299e9c..82183c453 100644 --- a/src/lib/corelib/language/loader.h +++ b/src/lib/corelib/language/loader.h @@ -42,7 +42,7 @@ #include "forward_decls.h" #include <logging/logger.h> -#include <QStringList> +#include <QtCore/qstringlist.h> namespace qbs { class Settings; diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index f92be53e4..ff6b02184 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -64,10 +64,10 @@ #include <tools/scripttools.h> #include <tools/settings.h> -#include <QDebug> -#include <QDir> -#include <QDirIterator> -#include <QPair> +#include <QtCore/qdebug.h> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qpair.h> #include <algorithm> diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index 0e56a2aa7..b43617554 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -48,11 +48,11 @@ #include <tools/setupprojectparameters.h> #include <tools/version.h> -#include <QMap> -#include <QSet> -#include <QStack> -#include <QStringList> -#include <QVariantMap> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> +#include <QtCore/qstack.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE class QScriptContext; diff --git a/src/lib/corelib/language/modulemerger.h b/src/lib/corelib/language/modulemerger.h index 479ad3008..69a703e4a 100644 --- a/src/lib/corelib/language/modulemerger.h +++ b/src/lib/corelib/language/modulemerger.h @@ -46,8 +46,8 @@ #include <logging/logger.h> #include <tools/version.h> -#include <QHash> -#include <QSet> +#include <QtCore/qhash.h> +#include <QtCore/qset.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/preparescriptobserver.cpp b/src/lib/corelib/language/preparescriptobserver.cpp index 748c343f4..5e643e84e 100644 --- a/src/lib/corelib/language/preparescriptobserver.cpp +++ b/src/lib/corelib/language/preparescriptobserver.cpp @@ -42,7 +42,7 @@ #include "property.h" #include "scriptengine.h" -#include <QScriptValue> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 6f8780da3..a195e095e 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -60,8 +60,8 @@ #include <tools/qttools.h> #include <tools/setupprojectparameters.h> -#include <QDir> -#include <QQueue> +#include <QtCore/qdir.h> +#include <QtCore/qqueue.h> #include <algorithm> diff --git a/src/lib/corelib/language/projectresolver.h b/src/lib/corelib/language/projectresolver.h index ffcc0e669..7278c0b53 100644 --- a/src/lib/corelib/language/projectresolver.h +++ b/src/lib/corelib/language/projectresolver.h @@ -46,8 +46,8 @@ #include <logging/logger.h> -#include <QMap> -#include <QSet> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/property.h b/src/lib/corelib/language/property.h index df63198f3..0bb1afbb1 100644 --- a/src/lib/corelib/language/property.h +++ b/src/lib/corelib/language/property.h @@ -39,9 +39,9 @@ #ifndef QBS_PROPERTY_H #define QBS_PROPERTY_H -#include <QSet> -#include <QString> -#include <QVariant> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/propertydeclaration.cpp b/src/lib/corelib/language/propertydeclaration.cpp index 14b43e734..fe128f709 100644 --- a/src/lib/corelib/language/propertydeclaration.cpp +++ b/src/lib/corelib/language/propertydeclaration.cpp @@ -41,9 +41,10 @@ #include "deprecationinfo.h" -#include <QScriptValue> -#include <QSharedData> -#include <QStringList> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> + +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/propertydeclaration.h b/src/lib/corelib/language/propertydeclaration.h index 5c72dd0cb..0279af2f0 100644 --- a/src/lib/corelib/language/propertydeclaration.h +++ b/src/lib/corelib/language/propertydeclaration.h @@ -40,7 +40,7 @@ #ifndef QBS_PROPERTYDECLARATION_H #define QBS_PROPERTYDECLARATION_H -#include <QSharedDataPointer> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE class QScriptValue; diff --git a/src/lib/corelib/language/propertymapinternal.h b/src/lib/corelib/language/propertymapinternal.h index e60d113bc..33b90bc46 100644 --- a/src/lib/corelib/language/propertymapinternal.h +++ b/src/lib/corelib/language/propertymapinternal.h @@ -42,7 +42,7 @@ #include "forward_decls.h" #include <tools/persistentobject.h> -#include <QVariantMap> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/qualifiedid.h b/src/lib/corelib/language/qualifiedid.h index 5414a2ab2..d7f85f052 100644 --- a/src/lib/corelib/language/qualifiedid.h +++ b/src/lib/corelib/language/qualifiedid.h @@ -40,8 +40,8 @@ #ifndef QBS_QUALIFIEDID_H #define QBS_QUALIFIEDID_H -#include <QHash> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> #include <set> diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp index 3e83fe6cb..bcd3b08c9 100644 --- a/src/lib/corelib/language/scriptengine.cpp +++ b/src/lib/corelib/language/scriptengine.cpp @@ -54,14 +54,15 @@ #include <tools/profiling.h> #include <tools/qbsassert.h> -#include <QDebug> -#include <QDirIterator> -#include <QFile> -#include <QFileInfo> -#include <QScriptValueIterator> -#include <QSet> -#include <QTextStream> -#include <QTimer> +#include <QtCore/qdebug.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qset.h> +#include <QtCore/qtextstream.h> +#include <QtCore/qtimer.h> + +#include <QtScript/qscriptvalueiterator.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/scriptengine.h b/src/lib/corelib/language/scriptengine.h index 837ba4cd3..ba1c6d3cf 100644 --- a/src/lib/corelib/language/scriptengine.h +++ b/src/lib/corelib/language/scriptengine.h @@ -45,13 +45,14 @@ #include <logging/logger.h> #include <tools/filetime.h> -#include <QDir> -#include <QHash> -#include <QList> -#include <QProcessEnvironment> -#include <QScriptEngine> -#include <QStack> -#include <QString> +#include <QtCore/qdir.h> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qprocess.h> +#include <QtCore/qstack.h> +#include <QtCore/qstring.h> + +#include <QtScript/qscriptengine.h> #include <vector> diff --git a/src/lib/corelib/language/scriptimporter.cpp b/src/lib/corelib/language/scriptimporter.cpp index 2d48e28ba..2e9fc9c7f 100644 --- a/src/lib/corelib/language/scriptimporter.cpp +++ b/src/lib/corelib/language/scriptimporter.cpp @@ -45,7 +45,7 @@ #include <parser/qmljsparser_p.h> #include <tools/error.h> -#include <QScriptValueIterator> +#include <QtScript/qscriptvalueiterator.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/scriptimporter.h b/src/lib/corelib/language/scriptimporter.h index 54cd00e0f..7cb4ea2e2 100644 --- a/src/lib/corelib/language/scriptimporter.h +++ b/src/lib/corelib/language/scriptimporter.h @@ -40,8 +40,9 @@ #ifndef SCRIPTIMPORTER_H #define SCRIPTIMPORTER_H -#include <QHash> -#include <QScriptEngine> +#include <QtCore/qhash.h> + +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/scriptpropertyobserver.h b/src/lib/corelib/language/scriptpropertyobserver.h index c0c6d1618..d24b17b8c 100644 --- a/src/lib/corelib/language/scriptpropertyobserver.h +++ b/src/lib/corelib/language/scriptpropertyobserver.h @@ -40,7 +40,7 @@ #ifndef QBS_SCRIPTPROPERTYOBSERVER_H #define QBS_SCRIPTPROPERTYOBSERVER_H -#include <QtGlobal> +#include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE class QScriptValue; diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index 7f1606b12..0c979bf94 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -62,8 +62,8 @@ #include <tools/profile.h> #include <tools/settings.h> -#include <QProcessEnvironment> -#include <QVector> +#include <QtCore/qprocess.h> +#include <QtCore/qvector.h> #include <algorithm> diff --git a/src/lib/corelib/language/tst_language.h b/src/lib/corelib/language/tst_language.h index 193f2df3c..f5fb4fc27 100644 --- a/src/lib/corelib/language/tst_language.h +++ b/src/lib/corelib/language/tst_language.h @@ -45,7 +45,7 @@ #include <logging/ilogsink.h> #include <tools/setupprojectparameters.h> #include <tools/qbs_export.h> -#include <QtTest> +#include <QtTest/qtest.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/language/value.h b/src/lib/corelib/language/value.h index 4231f4c34..eb62f13ca 100644 --- a/src/lib/corelib/language/value.h +++ b/src/lib/corelib/language/value.h @@ -42,7 +42,7 @@ #include "forward_decls.h" #include <tools/codelocation.h> -#include <QVariant> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/logging/ilogsink.cpp b/src/lib/corelib/logging/ilogsink.cpp index 4bec7f612..34abca24e 100644 --- a/src/lib/corelib/logging/ilogsink.cpp +++ b/src/lib/corelib/logging/ilogsink.cpp @@ -40,8 +40,8 @@ #include <tools/error.h> -#include <QByteArray> -#include <QMutex> +#include <QtCore/qbytearray.h> +#include <QtCore/qmutex.h> namespace qbs { diff --git a/src/lib/corelib/logging/ilogsink.h b/src/lib/corelib/logging/ilogsink.h index c5c310723..4b25aa7b8 100644 --- a/src/lib/corelib/logging/ilogsink.h +++ b/src/lib/corelib/logging/ilogsink.h @@ -41,7 +41,7 @@ #include "../tools/qbs_export.h" -#include <QString> +#include <QtCore/qstring.h> namespace qbs { class ErrorInfo; diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp index 7aadd785b..c1d9f619a 100644 --- a/src/lib/corelib/logging/logger.cpp +++ b/src/lib/corelib/logging/logger.cpp @@ -43,11 +43,11 @@ #include "logger.h" -#include <QByteArray> -#include <QElapsedTimer> -#include <QMutex> -#include <QSet> -#include <QVariant> +#include <QtCore/qbytearray.h> +#include <QtCore/qelapsedtimer.h> +#include <QtCore/qmutex.h> +#include <QtCore/qset.h> +#include <QtCore/qvariant.h> #include <cstdarg> #include <stdio.h> diff --git a/src/lib/corelib/logging/logger.h b/src/lib/corelib/logging/logger.h index ef35198be..be0c1de3d 100644 --- a/src/lib/corelib/logging/logger.h +++ b/src/lib/corelib/logging/logger.h @@ -44,9 +44,9 @@ #include <tools/error.h> -#include <QByteArray> -#include <QString> -#include <QStringList> +#include <QtCore/qbytearray.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/lib/corelib/logging/translator.h b/src/lib/corelib/logging/translator.h index 4eca789e0..122457e54 100644 --- a/src/lib/corelib/logging/translator.h +++ b/src/lib/corelib/logging/translator.h @@ -41,7 +41,7 @@ #include <tools/qbs_export.h> -#include <QCoreApplication> +#include <QtCore/qcoreapplication.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/parser/qmljs.g b/src/lib/corelib/parser/qmljs.g index c19537376..956c65809 100644 --- a/src/lib/corelib/parser/qmljs.g +++ b/src/lib/corelib/parser/qmljs.g @@ -138,8 +138,8 @@ ** ****************************************************************************/ -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> +#include <QtCore/qdebug.h> +#include <QtCore/qcoreapplication.h> #include <string.h> @@ -197,8 +197,8 @@ #include "qmljsast_p.h" #include "qmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QtCore/qlist.h> +#include <QtCore/qstring.h> QT_QML_BEGIN_NAMESPACE @@ -375,7 +375,7 @@ protected: /. #include "qmljsparser_p.h" -#include <QVarLengthArray> +#include <QtCore/qvarlengtharray.h> // // This file is automatically generated from qmljs.g. diff --git a/src/lib/corelib/parser/qmljsast_p.h b/src/lib/corelib/parser/qmljsast_p.h index 4506eeb14..072c77521 100644 --- a/src/lib/corelib/parser/qmljsast_p.h +++ b/src/lib/corelib/parser/qmljsast_p.h @@ -55,7 +55,7 @@ #include "qmljsglobal_p.h" #include "qmljsmemorypool_p.h" -#include <QtCore/QString> +#include <QtCore/qstring.h> namespace QbsQmlJS { diff --git a/src/lib/corelib/parser/qmljsengine_p.cpp b/src/lib/corelib/parser/qmljsengine_p.cpp index 66e6f3725..8a7b9dbc8 100644 --- a/src/lib/corelib/parser/qmljsengine_p.cpp +++ b/src/lib/corelib/parser/qmljsengine_p.cpp @@ -40,9 +40,9 @@ #include "qmljsengine_p.h" #include "qmljsglobal_p.h" -#include <qnumeric.h> -#include <QHash> -#include <QDebug> +#include <QtCore/qnumeric.h> +#include <QtCore/qhash.h> +#include <QtCore/qdebug.h> namespace QbsQmlJS { diff --git a/src/lib/corelib/parser/qmljsengine_p.h b/src/lib/corelib/parser/qmljsengine_p.h index e39308e48..14d5dfd74 100644 --- a/src/lib/corelib/parser/qmljsengine_p.h +++ b/src/lib/corelib/parser/qmljsengine_p.h @@ -55,8 +55,8 @@ #include "qmljsastfwd_p.h" #include "qmljsmemorypool_p.h" -#include <QString> -#include <QSet> +#include <QtCore/qstring.h> +#include <QtCore/qset.h> namespace QbsQmlJS { diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp index 946463826..43c52a474 100644 --- a/src/lib/corelib/parser/qmljslexer.cpp +++ b/src/lib/corelib/parser/qmljslexer.cpp @@ -41,9 +41,9 @@ #include "qmljsengine_p.h" #include "qmljsmemorypool_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QVarLengthArray> -#include <QtCore/QDebug> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qvarlengtharray.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); diff --git a/src/lib/corelib/parser/qmljslexer_p.h b/src/lib/corelib/parser/qmljslexer_p.h index 3c92928ac..7a77ddabe 100644 --- a/src/lib/corelib/parser/qmljslexer_p.h +++ b/src/lib/corelib/parser/qmljslexer_p.h @@ -53,7 +53,7 @@ #include "qmljsglobal_p.h" #include "qmljsgrammar_p.h" -#include <QtCore/QString> +#include <QtCore/qstring.h> namespace QbsQmlJS { diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp index 189855da9..963631b7d 100644 --- a/src/lib/corelib/parser/qmljsparser.cpp +++ b/src/lib/corelib/parser/qmljsparser.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> +#include <QtCore/qdebug.h> +#include <QtCore/qcoreapplication.h> #include <string.h> @@ -50,7 +50,7 @@ #include "qmljsparser_p.h" -#include <QVarLengthArray> +#include <QtCore/qvarlengtharray.h> // // This file is automatically generated from qmljs.g. diff --git a/src/lib/corelib/parser/qmljsparser_p.h b/src/lib/corelib/parser/qmljsparser_p.h index 1a9958e5d..93c096367 100644 --- a/src/lib/corelib/parser/qmljsparser_p.h +++ b/src/lib/corelib/parser/qmljsparser_p.h @@ -62,8 +62,8 @@ #include "qmljsast_p.h" #include "qmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QtCore/qlist.h> +#include <QtCore/qstring.h> namespace QbsQmlJS { diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp index 54e7ced05..69c59e6db 100644 --- a/src/lib/corelib/tools/applecodesignutils.cpp +++ b/src/lib/corelib/tools/applecodesignutils.cpp @@ -38,17 +38,17 @@ ****************************************************************************/ #include "applecodesignutils.h" -#include <QByteArray> -#include <QCryptographicHash> -#include <QDateTime> -#include <QSslCertificate> -#include <QSslCertificateExtension> +#include <QtCore/qbytearray.h> +#include <QtCore/qcryptographichash.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qdebug.h> + +#include <QtNetwork/qsslcertificate.h> +#include <QtNetwork/qsslcertificateextension.h> #include <QtCore/private/qcore_mac_p.h> #include <Security/Security.h> -#include <QDebug> - namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/applecodesignutils.h b/src/lib/corelib/tools/applecodesignutils.h index 95b9186ad..4ee8e1652 100644 --- a/src/lib/corelib/tools/applecodesignutils.h +++ b/src/lib/corelib/tools/applecodesignutils.h @@ -41,7 +41,7 @@ #define QBS_APPLECODESIGNUTILS_H #include "qbs_export.h" -#include <QVariantMap> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/architectures.cpp b/src/lib/corelib/tools/architectures.cpp index 02f0fc868..b2ef2d20a 100644 --- a/src/lib/corelib/tools/architectures.cpp +++ b/src/lib/corelib/tools/architectures.cpp @@ -40,9 +40,8 @@ #include "architectures.h" -#include <QMap> -#include <QMapIterator> -#include <QStringList> +#include <QtCore/qmap.h> +#include <QtCore/qstringlist.h> namespace qbs { diff --git a/src/lib/corelib/tools/buildgraphlocker.cpp b/src/lib/corelib/tools/buildgraphlocker.cpp index 529ac0973..fa87b9105 100644 --- a/src/lib/corelib/tools/buildgraphlocker.cpp +++ b/src/lib/corelib/tools/buildgraphlocker.cpp @@ -47,10 +47,10 @@ #include <logging/translator.h> -#include <QDir> -#include <QDirIterator> -#include <QFileInfo> -#include <QString> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/buildgraphlocker.h b/src/lib/corelib/tools/buildgraphlocker.h index a7554f91a..390ccfa98 100644 --- a/src/lib/corelib/tools/buildgraphlocker.h +++ b/src/lib/corelib/tools/buildgraphlocker.h @@ -42,9 +42,9 @@ #include <logging/logger.h> -#include <QLockFile> -#include <QQueue> -#include <QString> +#include <QtCore/qlockfile.h> +#include <QtCore/qqueue.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/buildoptions.cpp b/src/lib/corelib/tools/buildoptions.cpp index 70585fa45..ac8e39867 100644 --- a/src/lib/corelib/tools/buildoptions.cpp +++ b/src/lib/corelib/tools/buildoptions.cpp @@ -38,8 +38,8 @@ ****************************************************************************/ #include "buildoptions.h" -#include <QSharedData> -#include <QThread> +#include <QtCore/qshareddata.h> +#include <QtCore/qthread.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/buildoptions.h b/src/lib/corelib/tools/buildoptions.h index 0931243e6..1a0ac70dc 100644 --- a/src/lib/corelib/tools/buildoptions.h +++ b/src/lib/corelib/tools/buildoptions.h @@ -43,8 +43,8 @@ #include "commandechomode.h" -#include <QSharedDataPointer> -#include <QStringList> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { class BuildOptionsPrivate; } diff --git a/src/lib/corelib/tools/cleanoptions.cpp b/src/lib/corelib/tools/cleanoptions.cpp index 4ea40a4f4..bfedd6467 100644 --- a/src/lib/corelib/tools/cleanoptions.cpp +++ b/src/lib/corelib/tools/cleanoptions.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "cleanoptions.h" -#include <QSharedData> +#include <QtCore/qshareddata.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/cleanoptions.h b/src/lib/corelib/tools/cleanoptions.h index 942416c23..a2f22c3d3 100644 --- a/src/lib/corelib/tools/cleanoptions.h +++ b/src/lib/corelib/tools/cleanoptions.h @@ -41,8 +41,8 @@ #include "qbs_export.h" -#include <QSharedDataPointer> -#include <QString> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { class CleanOptionsPrivate; } diff --git a/src/lib/corelib/tools/codelocation.cpp b/src/lib/corelib/tools/codelocation.cpp index d9784b62c..c327d4ecb 100644 --- a/src/lib/corelib/tools/codelocation.cpp +++ b/src/lib/corelib/tools/codelocation.cpp @@ -42,11 +42,11 @@ #include <tools/persistence.h> #include <tools/qbsassert.h> -#include <QDataStream> -#include <QDir> -#include <QRegExp> -#include <QSharedData> -#include <QString> +#include <QtCore/qdatastream.h> +#include <QtCore/qdir.h> +#include <QtCore/qregexp.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> namespace qbs { diff --git a/src/lib/corelib/tools/codelocation.h b/src/lib/corelib/tools/codelocation.h index 71ea51317..16e86e4c5 100644 --- a/src/lib/corelib/tools/codelocation.h +++ b/src/lib/corelib/tools/codelocation.h @@ -42,8 +42,8 @@ #include "qbs_export.h" -#include <QDebug> -#include <QExplicitlySharedDataPointer> +#include <QtCore/qdebug.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE class QDataStream; diff --git a/src/lib/corelib/tools/commandechomode.h b/src/lib/corelib/tools/commandechomode.h index 16d5c97dc..8a7852211 100644 --- a/src/lib/corelib/tools/commandechomode.h +++ b/src/lib/corelib/tools/commandechomode.h @@ -42,8 +42,8 @@ #define QBS_COMMANDECHOMODE_H #include "qbs_export.h" -#include <QString> -#include <QStringList> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> namespace qbs { diff --git a/src/lib/corelib/tools/error.cpp b/src/lib/corelib/tools/error.cpp index 820692b99..2c8cf00b5 100644 --- a/src/lib/corelib/tools/error.cpp +++ b/src/lib/corelib/tools/error.cpp @@ -41,9 +41,9 @@ #include "persistence.h" -#include <QRegularExpression> -#include <QSharedData> -#include <QStringList> +#include <QtCore/qregularexpression.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> #include <algorithm> #include <functional> diff --git a/src/lib/corelib/tools/error.h b/src/lib/corelib/tools/error.h index afab6aa54..93a42f90d 100644 --- a/src/lib/corelib/tools/error.h +++ b/src/lib/corelib/tools/error.h @@ -42,12 +42,12 @@ #include "codelocation.h" -#include <QExplicitlySharedDataPointer> -#include <QHash> -#include <QList> -#include <QMetaType> -#include <QSharedDataPointer> -#include <QString> +#include <QtCore/qshareddata.h> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qmetatype.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { class PersistentPool; } diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp index 0cde97814..ce259ee63 100644 --- a/src/lib/corelib/tools/executablefinder.cpp +++ b/src/lib/corelib/tools/executablefinder.cpp @@ -42,7 +42,7 @@ #include "fileinfo.h" #include "hostosinfo.h" -#include <QDir> +#include <QtCore/qdir.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/executablefinder.h b/src/lib/corelib/tools/executablefinder.h index 816d4d66e..949013f5a 100644 --- a/src/lib/corelib/tools/executablefinder.h +++ b/src/lib/corelib/tools/executablefinder.h @@ -43,7 +43,7 @@ #include <language/language.h> #include <logging/logger.h> -#include <QProcessEnvironment> +#include <QtCore/qprocess.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp index a41d6887c..f27d4d315 100644 --- a/src/lib/corelib/tools/fileinfo.cpp +++ b/src/lib/corelib/tools/fileinfo.cpp @@ -42,17 +42,17 @@ #include <logging/translator.h> #include <tools/qbsassert.h> -#include <QCoreApplication> -#include <QDateTime> -#include <QDir> -#include <QFileInfo> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> #if defined(Q_OS_UNIX) #include <errno.h> #include <sys/stat.h> #include <unistd.h> #elif defined(Q_OS_WIN) -#include <qt_windows.h> +#include <QtCore/qt_windows.h> #endif namespace qbs { diff --git a/src/lib/corelib/tools/fileinfo.h b/src/lib/corelib/tools/fileinfo.h index da2500ad7..1655e37d9 100644 --- a/src/lib/corelib/tools/fileinfo.h +++ b/src/lib/corelib/tools/fileinfo.h @@ -48,7 +48,7 @@ #include <sys/stat.h> #endif -#include <QString> +#include <QtCore/qstring.h> QT_FORWARD_DECLARE_CLASS(QFileInfo) diff --git a/src/lib/corelib/tools/filesaver.cpp b/src/lib/corelib/tools/filesaver.cpp index 4b2967b8e..eb41df7de 100644 --- a/src/lib/corelib/tools/filesaver.cpp +++ b/src/lib/corelib/tools/filesaver.cpp @@ -39,8 +39,8 @@ #include "filesaver.h" -#include <QFile> -#include <QSaveFile> +#include <QtCore/qfile.h> +#include <QtCore/qsavefile.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/filesaver.h b/src/lib/corelib/tools/filesaver.h index 5a3eb8739..38228ed0c 100644 --- a/src/lib/corelib/tools/filesaver.h +++ b/src/lib/corelib/tools/filesaver.h @@ -40,10 +40,10 @@ #ifndef FILESAVER_H #define FILESAVER_H -#include <QBuffer> -#include <QByteArray> -#include <QScopedPointer> -#include <QString> +#include <QtCore/qbuffer.h> +#include <QtCore/qbytearray.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/filetime.h b/src/lib/corelib/tools/filetime.h index 989591115..1c8884d9d 100644 --- a/src/lib/corelib/tools/filetime.h +++ b/src/lib/corelib/tools/filetime.h @@ -42,8 +42,8 @@ #include "persistence.h" -#include <QDataStream> -#include <QDebug> +#include <QtCore/qdatastream.h> +#include <QtCore/qdebug.h> #if defined(Q_OS_UNIX) #include <time.h> diff --git a/src/lib/corelib/tools/filetime_unix.cpp b/src/lib/corelib/tools/filetime_unix.cpp index ae0d9861f..5e9c64fc2 100644 --- a/src/lib/corelib/tools/filetime_unix.cpp +++ b/src/lib/corelib/tools/filetime_unix.cpp @@ -39,8 +39,8 @@ #include "filetime.h" -#include <QDateTime> -#include <QString> +#include <QtCore/qdatetime.h> +#include <QtCore/qstring.h> #include <time.h> diff --git a/src/lib/corelib/tools/filetime_win.cpp b/src/lib/corelib/tools/filetime_win.cpp index 806bc9c8b..2f42676c4 100644 --- a/src/lib/corelib/tools/filetime_win.cpp +++ b/src/lib/corelib/tools/filetime_win.cpp @@ -39,8 +39,8 @@ #include "filetime.h" -#include <QString> -#include <qt_windows.h> +#include <QtCore/qstring.h> +#include <QtCore/qt_windows.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/generateoptions.cpp b/src/lib/corelib/tools/generateoptions.cpp index fe6423aaa..019e2eb48 100644 --- a/src/lib/corelib/tools/generateoptions.cpp +++ b/src/lib/corelib/tools/generateoptions.cpp @@ -40,8 +40,8 @@ #include "generateoptions.h" -#include <QSharedData> -#include <QString> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/generateoptions.h b/src/lib/corelib/tools/generateoptions.h index b6546b7d4..869b9a576 100644 --- a/src/lib/corelib/tools/generateoptions.h +++ b/src/lib/corelib/tools/generateoptions.h @@ -42,7 +42,7 @@ #include "qbs_export.h" -#include <QSharedDataPointer> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE class QString; diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h index d3fa344fe..6d9aca96f 100644 --- a/src/lib/corelib/tools/hostosinfo.h +++ b/src/lib/corelib/tools/hostosinfo.h @@ -43,11 +43,11 @@ #include "qbs_export.h" #include "version.h" -#include <QtGlobal> -#include <QMap> -#include <QSettings> -#include <QString> -#include <QStringList> +#include <QtCore/qglobal.h> +#include <QtCore/qmap.h> +#include <QtCore/qsettings.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> #if defined(Q_OS_WIN) #define QBS_HOST_EXE_SUFFIX ".exe" diff --git a/src/lib/corelib/tools/id.cpp b/src/lib/corelib/tools/id.cpp index 17baa3c4b..2c28f53e5 100644 --- a/src/lib/corelib/tools/id.cpp +++ b/src/lib/corelib/tools/id.cpp @@ -40,9 +40,9 @@ #include "id.h" #include "qbsassert.h" -#include <QByteArray> -#include <QHash> -#include <QVector> +#include <QtCore/qbytearray.h> +#include <QtCore/qhash.h> +#include <QtCore/qvector.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/id.h b/src/lib/corelib/tools/id.h index 5fc755154..334acc686 100644 --- a/src/lib/corelib/tools/id.h +++ b/src/lib/corelib/tools/id.h @@ -40,9 +40,9 @@ #ifndef QBS_TOOLS_ID_H #define QBS_TOOLS_ID_H -#include <QMetaType> -#include <QString> -#include <QVariant> +#include <QtCore/qmetatype.h> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/installoptions.cpp b/src/lib/corelib/tools/installoptions.cpp index 8e485560f..1eb9a770d 100644 --- a/src/lib/corelib/tools/installoptions.cpp +++ b/src/lib/corelib/tools/installoptions.cpp @@ -39,8 +39,8 @@ #include "installoptions.h" #include "language/language.h" -#include <QDir> -#include <QSharedData> +#include <QtCore/qdir.h> +#include <QtCore/qshareddata.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/installoptions.h b/src/lib/corelib/tools/installoptions.h index cb463e2ea..0053e1248 100644 --- a/src/lib/corelib/tools/installoptions.h +++ b/src/lib/corelib/tools/installoptions.h @@ -41,8 +41,8 @@ #include "qbs_export.h" -#include <QSharedDataPointer> -#include <QString> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> namespace qbs { class InstallOptions; diff --git a/src/lib/corelib/tools/jsliterals.h b/src/lib/corelib/tools/jsliterals.h index 6fb7518bd..7286ca5de 100644 --- a/src/lib/corelib/tools/jsliterals.h +++ b/src/lib/corelib/tools/jsliterals.h @@ -42,9 +42,9 @@ #include "qbs_export.h" -#include <QString> -#include <QStringList> -#include <QVariant> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> namespace qbs { diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index a56f6b0c3..86fb63286 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -42,15 +42,15 @@ #include <tools/error.h> #include <tools/profile.h> -#include <QByteArray> -#include <QDir> -#include <QProcess> -#include <QScopedPointer> -#include <QStringList> -#include <QTemporaryFile> +#include <QtCore/qbytearray.h> +#include <QtCore/qdir.h> +#include <QtCore/qprocess.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qtemporaryfile.h> #ifdef Q_OS_WIN -#include <qt_windows.h> +#include <QtCore/qt_windows.h> #endif #include <algorithm> diff --git a/src/lib/corelib/tools/msvcinfo.h b/src/lib/corelib/tools/msvcinfo.h index aa0800aaa..733d8a90f 100644 --- a/src/lib/corelib/tools/msvcinfo.h +++ b/src/lib/corelib/tools/msvcinfo.h @@ -44,11 +44,11 @@ #include <tools/error.h> #include <tools/version.h> -#include <QDir> -#include <QFileInfo> -#include <QHash> -#include <QProcessEnvironment> -#include <QStringList> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qhash.h> +#include <QtCore/qprocess.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp index d9c4f6a96..3466422ab 100644 --- a/src/lib/corelib/tools/persistence.cpp +++ b/src/lib/corelib/tools/persistence.cpp @@ -44,8 +44,8 @@ #include <tools/error.h> #include <tools/qbsassert.h> -#include <QDir> -#include <QScopedPointer> +#include <QtCore/qdir.h> +#include <QtCore/qscopedpointer.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/persistence.h b/src/lib/corelib/tools/persistence.h index 481464e5f..ecabf9523 100644 --- a/src/lib/corelib/tools/persistence.h +++ b/src/lib/corelib/tools/persistence.h @@ -43,12 +43,12 @@ #include "persistentobject.h" #include <logging/logger.h> -#include <QDataStream> -#include <QProcessEnvironment> -#include <QSharedPointer> -#include <QString> -#include <QVariantMap> -#include <QVector> +#include <QtCore/qdatastream.h> +#include <QtCore/qprocess.h> +#include <QtCore/qsharedpointer.h> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> +#include <QtCore/qvector.h> #include <type_traits> diff --git a/src/lib/corelib/tools/preferences.h b/src/lib/corelib/tools/preferences.h index 031218dae..042a15a9e 100644 --- a/src/lib/corelib/tools/preferences.h +++ b/src/lib/corelib/tools/preferences.h @@ -43,8 +43,8 @@ #include "commandechomode.h" -#include <QStringList> -#include <QVariant> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> namespace qbs { class Settings; diff --git a/src/lib/corelib/tools/processresult.h b/src/lib/corelib/tools/processresult.h index 3f7af423c..0db1fe2bf 100644 --- a/src/lib/corelib/tools/processresult.h +++ b/src/lib/corelib/tools/processresult.h @@ -41,11 +41,11 @@ #include "qbs_export.h" -#include <QExplicitlySharedDataPointer> -#include <QMetaType> -#include <QProcess> -#include <QString> -#include <QStringList> +#include <QtCore/qshareddata.h> +#include <QtCore/qmetatype.h> +#include <QtCore/qprocess.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/processresult_p.h b/src/lib/corelib/tools/processresult_p.h index 379660295..141dd9301 100644 --- a/src/lib/corelib/tools/processresult_p.h +++ b/src/lib/corelib/tools/processresult_p.h @@ -39,9 +39,9 @@ #ifndef QBS_PROCESSRESULT_P_H #define QBS_PROCESSRESULT_P_H -#include <QSharedData> -#include <QStringList> -#include <QProcess> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qprocess.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/processutils.cpp b/src/lib/corelib/tools/processutils.cpp index 2f8254ab6..58a082fa5 100644 --- a/src/lib/corelib/tools/processutils.cpp +++ b/src/lib/corelib/tools/processutils.cpp @@ -41,7 +41,7 @@ #if defined(Q_OS_WIN) # define PSAPI_VERSION 1 // To use GetModuleFileNameEx from Psapi.lib on all Win versions. -# include <qt_windows.h> +# include <QtCore/qt_windows.h> # include <Psapi.h> #elif defined(Q_OS_DARWIN) # include <libproc.h> @@ -50,7 +50,7 @@ # include <unistd.h> # include <cstdio> #elif defined(Q_OS_BSD4) -# include <QFile> +# include <QtCore/qfile.h> # include <sys/cdefs.h> # include <sys/param.h> # include <sys/sysctl.h> diff --git a/src/lib/corelib/tools/processutils.h b/src/lib/corelib/tools/processutils.h index 6911e804c..5a210289d 100644 --- a/src/lib/corelib/tools/processutils.h +++ b/src/lib/corelib/tools/processutils.h @@ -40,8 +40,8 @@ #ifndef QBS_PROCESSUTILS_H #define QBS_PROCESSUTILS_H -#include <qglobal.h> -#include <QString> +#include <QtCore/qglobal.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/profile.h b/src/lib/corelib/tools/profile.h index 9a384d3a2..01663a09e 100644 --- a/src/lib/corelib/tools/profile.h +++ b/src/lib/corelib/tools/profile.h @@ -41,9 +41,9 @@ #include "qbs_export.h" -#include <QString> -#include <QStringList> -#include <QVariant> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> namespace qbs { class ErrorInfo; diff --git a/src/lib/corelib/tools/profiling.cpp b/src/lib/corelib/tools/profiling.cpp index 5d9e66f75..18ce2322d 100644 --- a/src/lib/corelib/tools/profiling.cpp +++ b/src/lib/corelib/tools/profiling.cpp @@ -42,7 +42,7 @@ #include <logging/logger.h> #include <logging/translator.h> -#include <QString> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/profiling.h b/src/lib/corelib/tools/profiling.h index f532eac2a..89f862ff9 100644 --- a/src/lib/corelib/tools/profiling.h +++ b/src/lib/corelib/tools/profiling.h @@ -40,7 +40,7 @@ #ifndef QBS_PROFILING_H #define QBS_PROFILING_H -#include <QElapsedTimer> +#include <QtCore/qelapsedtimer.h> QT_BEGIN_NAMESPACE class QString; diff --git a/src/lib/corelib/tools/progressobserver.h b/src/lib/corelib/tools/progressobserver.h index a4ef0902d..72b9694ba 100644 --- a/src/lib/corelib/tools/progressobserver.h +++ b/src/lib/corelib/tools/progressobserver.h @@ -39,7 +39,7 @@ #ifndef QBS_PROGRESSOBSERVER_H #define QBS_PROGRESSOBSERVER_H -#include <QtGlobal> +#include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE class QString; diff --git a/src/lib/corelib/tools/projectgeneratormanager.cpp b/src/lib/corelib/tools/projectgeneratormanager.cpp index 874659d32..9934987ef 100644 --- a/src/lib/corelib/tools/projectgeneratormanager.cpp +++ b/src/lib/corelib/tools/projectgeneratormanager.cpp @@ -44,9 +44,9 @@ #include <logging/translator.h> #include <tools/hostosinfo.h> -#include <QCoreApplication> -#include <QDirIterator> -#include <QLibrary> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qlibrary.h> #include "generators/clangcompilationdb/clangcompilationdbgenerator.h" #include "generators/visualstudio/visualstudiogenerator.h" diff --git a/src/lib/corelib/tools/projectgeneratormanager.h b/src/lib/corelib/tools/projectgeneratormanager.h index b61160ca3..611ee3d2b 100644 --- a/src/lib/corelib/tools/projectgeneratormanager.h +++ b/src/lib/corelib/tools/projectgeneratormanager.h @@ -44,10 +44,10 @@ #include <language/filetags.h> #include <generators/generator.h> -#include <QMap> -#include <QSharedPointer> -#include <QString> -#include <QStringList> +#include <QtCore/qmap.h> +#include <QtCore/qsharedpointer.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QLibrary; diff --git a/src/lib/corelib/tools/qbs_export.h b/src/lib/corelib/tools/qbs_export.h index c249601ac..5bb28f98d 100644 --- a/src/lib/corelib/tools/qbs_export.h +++ b/src/lib/corelib/tools/qbs_export.h @@ -39,7 +39,7 @@ #ifndef QBS_EXPORT_H #define QBS_EXPORT_H -#include <qglobal.h> +#include <QtCore/qglobal.h> #ifdef QBS_STATIC_LIB # define QBS_EXPORT diff --git a/src/lib/corelib/tools/qbsassert.cpp b/src/lib/corelib/tools/qbsassert.cpp index 9bbdfb9aa..f002469d0 100644 --- a/src/lib/corelib/tools/qbsassert.cpp +++ b/src/lib/corelib/tools/qbsassert.cpp @@ -40,7 +40,7 @@ #include "qbsassert.h" #include "error.h" -#include <QString> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/qttools.h b/src/lib/corelib/tools/qttools.h index bf7687fcf..024a53423 100644 --- a/src/lib/corelib/tools/qttools.h +++ b/src/lib/corelib/tools/qttools.h @@ -40,8 +40,8 @@ #ifndef QBSQTTOOLS_H #define QBSQTTOOLS_H -#include <QHash> -#include <QStringList> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE uint qHash(const QStringList &list); diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp index 883eb7c56..8a415af9b 100644 --- a/src/lib/corelib/tools/scannerpluginmanager.cpp +++ b/src/lib/corelib/tools/scannerpluginmanager.cpp @@ -43,9 +43,9 @@ #include <logging/translator.h> #include <tools/hostosinfo.h> -#include <QCoreApplication> -#include <QDirIterator> -#include <QLibrary> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qlibrary.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/scannerpluginmanager.h b/src/lib/corelib/tools/scannerpluginmanager.h index dc7cd8ead..a5e1ef88c 100644 --- a/src/lib/corelib/tools/scannerpluginmanager.h +++ b/src/lib/corelib/tools/scannerpluginmanager.h @@ -43,8 +43,8 @@ #include <language/filetags.h> #include <plugins/scanner/scanner.h> -#include <QHash> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qstring.h> QT_BEGIN_NAMESPACE class QLibrary; diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp index 39524b841..7f094f9bb 100644 --- a/src/lib/corelib/tools/scripttools.cpp +++ b/src/lib/corelib/tools/scripttools.cpp @@ -39,8 +39,9 @@ #include "scripttools.h" -#include <QDataStream> -#include <QScriptEngine> +#include <QtCore/qdatastream.h> + +#include <QtScript/qscriptengine.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/scripttools.h b/src/lib/corelib/tools/scripttools.h index 6814cb285..0b79a4a11 100644 --- a/src/lib/corelib/tools/scripttools.h +++ b/src/lib/corelib/tools/scripttools.h @@ -42,11 +42,12 @@ #include <tools/qbs_export.h> -#include <QScriptEngine> -#include <QScriptProgram> -#include <QScriptValue> -#include <QStringList> -#include <QVariantMap> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> + +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptprogram.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp index bb4f71b93..a8d51f099 100644 --- a/src/lib/corelib/tools/settings.cpp +++ b/src/lib/corelib/tools/settings.cpp @@ -44,7 +44,7 @@ #include <logging/translator.h> -#include <QSettings> +#include <QtCore/qsettings.h> #include <algorithm> diff --git a/src/lib/corelib/tools/settings.h b/src/lib/corelib/tools/settings.h index ad0f51234..2e11e903d 100644 --- a/src/lib/corelib/tools/settings.h +++ b/src/lib/corelib/tools/settings.h @@ -42,8 +42,8 @@ #include "qbs_export.h" -#include <QStringList> -#include <QVariant> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp index efa8d8ded..67be7f9f6 100644 --- a/src/lib/corelib/tools/settingscreator.cpp +++ b/src/lib/corelib/tools/settingscreator.cpp @@ -42,10 +42,10 @@ #include "fileinfo.h" #include "hostosinfo.h" -#include <QDirIterator> -#include <QFileInfo> -#include <QSettings> -#include <QStringList> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qsettings.h> +#include <QtCore/qstringlist.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/settingscreator.h b/src/lib/corelib/tools/settingscreator.h index ad0f05f5d..6bc2a5cb7 100644 --- a/src/lib/corelib/tools/settingscreator.h +++ b/src/lib/corelib/tools/settingscreator.h @@ -42,7 +42,7 @@ #include "version.h" -#include <QString> +#include <QtCore/qstring.h> #include <memory> diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index 758a92829..f501f9e37 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -41,15 +41,16 @@ #include <tools/jsliterals.h> #include <tools/settings.h> +#include <QtCore/qlist.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstring.h> + #ifdef QT_GUI_LIB -#include <QBrush> +#include <QtGui/qbrush.h> #endif -#include <QList> -#include <QScopedPointer> -#include <QScriptEngine> -#include <QScriptValue> -#include <QString> +#include <QtScript/qscriptengine.h> +#include <QtScript/qscriptvalue.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/settingsmodel.h b/src/lib/corelib/tools/settingsmodel.h index 4ac8911cc..8628bf77d 100644 --- a/src/lib/corelib/tools/settingsmodel.h +++ b/src/lib/corelib/tools/settingsmodel.h @@ -42,8 +42,8 @@ #include <tools/qbs_export.h> -#include <QAbstractItemModel> -#include <QVariantMap> +#include <QtCore/qabstractitemmodel.h> +#include <QtCore/qvariant.h> namespace qbs { diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp index 33918e16f..e7660cae2 100644 --- a/src/lib/corelib/tools/setupprojectparameters.cpp +++ b/src/lib/corelib/tools/setupprojectparameters.cpp @@ -45,7 +45,7 @@ #include <tools/scripttools.h> #include <tools/settings.h> -#include <QFileInfo> +#include <QtCore/qfileinfo.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/setupprojectparameters.h b/src/lib/corelib/tools/setupprojectparameters.h index 2682a1e7c..e3f562482 100644 --- a/src/lib/corelib/tools/setupprojectparameters.h +++ b/src/lib/corelib/tools/setupprojectparameters.h @@ -43,10 +43,10 @@ #include <tools/error.h> -#include <QProcessEnvironment> -#include <QSharedDataPointer> -#include <QStringList> -#include <QVariantMap> +#include <QtCore/qprocess.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> namespace qbs { diff --git a/src/lib/corelib/tools/shellutils.cpp b/src/lib/corelib/tools/shellutils.cpp index 8c91638da..3eea8724d 100644 --- a/src/lib/corelib/tools/shellutils.cpp +++ b/src/lib/corelib/tools/shellutils.cpp @@ -40,9 +40,9 @@ #include "shellutils.h" #include "pathutils.h" -#include <QFile> -#include <QRegExp> -#include <QTextStream> +#include <QtCore/qfile.h> +#include <QtCore/qregexp.h> +#include <QtCore/qtextstream.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/shellutils.h b/src/lib/corelib/tools/shellutils.h index 5339405c4..9d840db2d 100644 --- a/src/lib/corelib/tools/shellutils.h +++ b/src/lib/corelib/tools/shellutils.h @@ -43,8 +43,8 @@ #include "qbs_export.h" #include "hostosinfo.h" -#include <QString> -#include <QVector> +#include <QtCore/qstring.h> +#include <QtCore/qvector.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/toolchains.cpp b/src/lib/corelib/tools/toolchains.cpp index eae6bca01..28b00908b 100644 --- a/src/lib/corelib/tools/toolchains.cpp +++ b/src/lib/corelib/tools/toolchains.cpp @@ -38,8 +38,8 @@ ****************************************************************************/ #include "toolchains.h" -#include <QMap> -#include <QSet> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> namespace qbs { diff --git a/src/lib/corelib/tools/toolchains.h b/src/lib/corelib/tools/toolchains.h index 1bb52ca80..b8d2c8ee4 100644 --- a/src/lib/corelib/tools/toolchains.h +++ b/src/lib/corelib/tools/toolchains.h @@ -40,7 +40,7 @@ #define QBS_TOOLCHAINS_H #include "qbs_export.h" -#include <QStringList> +#include <QtCore/qstringlist.h> namespace qbs { diff --git a/src/lib/corelib/tools/tst_tools.cpp b/src/lib/corelib/tools/tst_tools.cpp index f3d213e2e..8e77510fe 100644 --- a/src/lib/corelib/tools/tst_tools.cpp +++ b/src/lib/corelib/tools/tst_tools.cpp @@ -51,13 +51,14 @@ #include "setupprojectparameters.h" #include "version.h" -#include <QDir> -#include <QFile> -#include <QFileInfo> -#include <QSettings> -#include <QTemporaryDir> -#include <QTemporaryFile> -#include <QTest> +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qsettings.h> +#include <QtCore/qtemporarydir.h> +#include <QtCore/qtemporaryfile.h> + +#include <QtTest/qtest.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/tst_tools.h b/src/lib/corelib/tools/tst_tools.h index e71ccd0cf..277c2c985 100644 --- a/src/lib/corelib/tools/tst_tools.h +++ b/src/lib/corelib/tools/tst_tools.h @@ -38,8 +38,8 @@ ****************************************************************************/ #include "qbs_export.h" -#include <QList> -#include <QObject> +#include <QtCore/qlist.h> +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE class QTemporaryDir; diff --git a/src/lib/corelib/tools/version.cpp b/src/lib/corelib/tools/version.cpp index 9e1cbfedf..dce3e2f8d 100644 --- a/src/lib/corelib/tools/version.cpp +++ b/src/lib/corelib/tools/version.cpp @@ -39,8 +39,8 @@ #include "version.h" -#include <QRegExp> -#include <QString> +#include <QtCore/qregexp.h> +#include <QtCore/qstring.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp index 1022c250b..75d86e775 100644 --- a/src/lib/corelib/tools/visualstudioversioninfo.cpp +++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp @@ -40,8 +40,8 @@ #include "visualstudioversioninfo.h" #include <tools/qbsassert.h> -#include <QDebug> -#include <QtGlobal> +#include <QtCore/qdebug.h> +#include <QtCore/qglobal.h> namespace qbs { namespace Internal { diff --git a/src/lib/corelib/tools/visualstudioversioninfo.h b/src/lib/corelib/tools/visualstudioversioninfo.h index 2629e349d..59b107b78 100644 --- a/src/lib/corelib/tools/visualstudioversioninfo.h +++ b/src/lib/corelib/tools/visualstudioversioninfo.h @@ -43,8 +43,8 @@ #include "qbs_export.h" -#include <QSet> -#include <QString> +#include <QtCore/qset.h> +#include <QtCore/qstring.h> #include <tools/version.h> namespace qbs { diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp index 4d359f85c..318fa367e 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.cpp +++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp @@ -42,14 +42,14 @@ #include <logging/translator.h> #include <tools/qbsassert.h> -#include <QDebug> -#include <QDir> -#include <QProcess> -#include <QTemporaryFile> -#include <QTextStream> +#include <QtCore/qdebug.h> +#include <QtCore/qdir.h> +#include <QtCore/qprocess.h> +#include <QtCore/qtemporaryfile.h> +#include <QtCore/qtextstream.h> #ifdef Q_OS_WIN -#include <qt_windows.h> +#include <QtCore/qt_windows.h> #include <ShlObj.h> #endif diff --git a/src/lib/corelib/tools/vsenvironmentdetector.h b/src/lib/corelib/tools/vsenvironmentdetector.h index bf715b28c..30a574edb 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.h +++ b/src/lib/corelib/tools/vsenvironmentdetector.h @@ -43,7 +43,7 @@ #include "qbs_export.h" #include "msvcinfo.h" -#include <QStringList> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/lib/corelib/tools/weakpointer.h b/src/lib/corelib/tools/weakpointer.h index edf91336a..8f78f5d20 100644 --- a/src/lib/corelib/tools/weakpointer.h +++ b/src/lib/corelib/tools/weakpointer.h @@ -39,7 +39,7 @@ #ifndef QBS_WEAKPOINTER_H #define QBS_WEAKPOINTER_H -#include <QWeakPointer> +#include <QtCore/qpointer.h> namespace qbs { namespace Internal { diff --git a/src/lib/qtprofilesetup/qtenvironment.h b/src/lib/qtprofilesetup/qtenvironment.h index b861740a0..f78a8f359 100644 --- a/src/lib/qtprofilesetup/qtenvironment.h +++ b/src/lib/qtprofilesetup/qtenvironment.h @@ -41,7 +41,7 @@ #include <tools/qbs_export.h> -#include <QStringList> +#include <QtCore/qstringlist.h> namespace qbs { diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index 93a846454..115099754 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -44,9 +44,9 @@ #include <tools/error.h> #include <tools/profile.h> -#include <QDirIterator> -#include <QFile> -#include <QHash> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfile.h> +#include <QtCore/qhash.h> namespace qbs { namespace Internal { diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.h b/src/lib/qtprofilesetup/qtmoduleinfo.h index 3087361c5..5d1b6d956 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.h +++ b/src/lib/qtprofilesetup/qtmoduleinfo.h @@ -39,8 +39,8 @@ #ifndef QBS_QTMODULEINFO_H #define QBS_QTMODULEINFO_H -#include <QSet> -#include <QStringList> +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> namespace qbs { class QtEnvironment; diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 8e15ac01a..aaed319bb 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -49,13 +49,13 @@ #include <tools/settings.h> #include <tools/version.h> -#include <QDir> -#include <QDirIterator> -#include <QFile> -#include <QFileInfo> -#include <QLibrary> -#include <QRegExp> -#include <QTextStream> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qlibrary.h> +#include <QtCore/qregexp.h> +#include <QtCore/qtextstream.h> namespace qbs { using namespace Internal; diff --git a/src/lib/qtprofilesetup/qtprofilesetup.h b/src/lib/qtprofilesetup/qtprofilesetup.h index 613aedf41..c6f707e26 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.h +++ b/src/lib/qtprofilesetup/qtprofilesetup.h @@ -43,7 +43,7 @@ #include <tools/qbs_export.h> -#include <QStringList> +#include <QtCore/qstringlist.h> namespace qbs { class ErrorInfo; diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 53ce93e32..53a5b62b3 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -50,14 +50,13 @@ using namespace CPlusPlus; #include <sys/mman.h> #include <unistd.h> #else -#include <QtCore/QFile> +#include <QtCore/qfile.h> #endif -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QScopedPointer> -#include <QtCore/QString> -#include <QtCore/QLatin1Literal> +#include <QtCore/qbytearray.h> +#include <QtCore/qlist.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstring.h> #include <cstring> diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp index 0374fc373..c53a69fd1 100644 --- a/src/plugins/scanner/qt/qtscanner.cpp +++ b/src/plugins/scanner/qt/qtscanner.cpp @@ -45,7 +45,7 @@ #include "../scanner.h" -#include <QtGlobal> +#include <QtCore/qglobal.h> #ifdef Q_OS_UNIX #include <sys/types.h> @@ -54,12 +54,12 @@ #include <sys/mman.h> #include <unistd.h> #else -#include <QFile> +#include <QtCore/qfile.h> #endif -#include <QScopedPointer> -#include <QString> -#include <QXmlStreamReader> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstring.h> +#include <QtCore/qxmlstream.h> struct OpaqQrc { |