diff options
Diffstat (limited to 'src/lib/corelib/tools')
73 files changed, 202 insertions, 199 deletions
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 { |