diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-03-09 23:27:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 15:04:11 +0100 |
| commit | 50f8133a1a1eb434abafcca5335be706d4f0b694 (patch) | |
| tree | 5139515a7e44e860a19b016c65ba139ea6ce8a76 /tools | |
| parent | fe2de633f9b9454ec8a9c2a5874ad85f49d8d54d (diff) | |
Remove several uses of module includes
Module includes are discouraged because they may increase compilation
time. While debugging a broken core module include header, a number
of module include infractions were discovered in qtdeclarative. Replace
them with their more specific counterparts.
Change-Id: I614e9a6aa2177f396e5289f3cdb3c35faa0202c9
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/conf.h | 3 | ||||
| -rw-r--r-- | tools/qml/main.cpp | 3 | ||||
| -rw-r--r-- | tools/qmlbundle/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qmljs/main.cpp | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/tools/qml/conf.h b/tools/qml/conf.h index 24ea44edb9..47e5f2d3f7 100644 --- a/tools/qml/conf.h +++ b/tools/qml/conf.h @@ -41,7 +41,8 @@ #ifndef CONF_H #define CONF_H -#include <QtQml> +#include <QtQml/QQmlContext> +#include <QtQml/QQmlListProperty> #include <QObject> #include <QUrl> diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 804241f023..08095962be 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -53,12 +53,15 @@ #endif // QT_GUI_LIB #include <QQmlApplicationEngine> +#include <QQmlComponent> +#include <QDir> #include <QFile> #include <QFileInfo> #include <QRegularExpression> #include <QStringList> #include <QDebug> #include <QStandardPaths> +#include <QTranslator> #include <QtGlobal> #include <qqml.h> #include <qqmldebug.h> diff --git a/tools/qmlbundle/main.cpp b/tools/qmlbundle/main.cpp index 041041b91a..60d12e8574 100644 --- a/tools/qmlbundle/main.cpp +++ b/tools/qmlbundle/main.cpp @@ -41,7 +41,7 @@ #include <private/qqmlbundle_p.h> #include <private/qqmlscript_p.h> -#include <QtCore/QtCore> +#include <QtCore/QCoreApplication> #include <iostream> static bool createBundle(const QString &fileName, const QStringList &fileNames) diff --git a/tools/qmljs/main.cpp b/tools/qmljs/main.cpp index f13f42881c..aaddfbf904 100644 --- a/tools/qmljs/main.cpp +++ b/tools/qmljs/main.cpp @@ -57,7 +57,8 @@ # include "private/qv4isel_masm_p.h" #endif // V4_ENABLE_JIT -#include <QtCore> +#include <QtCore/QCoreApplication> +#include <QtCore/QFile> #include <private/qqmljsengine_p.h> #include <private/qqmljslexer_p.h> #include <private/qqmljsparser_p.h> |