diff options
Diffstat (limited to 'src/lib/corelib/language')
49 files changed, 134 insertions, 124 deletions
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 { |