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>
This commit is contained in:
Andrew Knight 2014-03-09 23:27:34 +02:00 committed by The Qt Project
parent fe2de633f9
commit 50f8133a1a
6 changed files with 10 additions and 5 deletions

View File

@ -46,7 +46,7 @@
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
#include <QSet> #include <QSet>
#include <QtGui> #include <QtGui/qopengl.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -39,7 +39,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtCore> #include <QtCore/QByteArray>
#include <QtGui/QSurfaceFormat> #include <QtGui/QSurfaceFormat>
// Duct Tape tokenizer for the purpose of parsing and rewriting // Duct Tape tokenizer for the purpose of parsing and rewriting

View File

@ -41,7 +41,8 @@
#ifndef CONF_H #ifndef CONF_H
#define CONF_H #define CONF_H
#include <QtQml> #include <QtQml/QQmlContext>
#include <QtQml/QQmlListProperty>
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>

View File

@ -53,12 +53,15 @@
#endif // QT_GUI_LIB #endif // QT_GUI_LIB
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QQmlComponent>
#include <QDir>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QRegularExpression> #include <QRegularExpression>
#include <QStringList> #include <QStringList>
#include <QDebug> #include <QDebug>
#include <QStandardPaths> #include <QStandardPaths>
#include <QTranslator>
#include <QtGlobal> #include <QtGlobal>
#include <qqml.h> #include <qqml.h>
#include <qqmldebug.h> #include <qqmldebug.h>

View File

@ -41,7 +41,7 @@
#include <private/qqmlbundle_p.h> #include <private/qqmlbundle_p.h>
#include <private/qqmlscript_p.h> #include <private/qqmlscript_p.h>
#include <QtCore/QtCore> #include <QtCore/QCoreApplication>
#include <iostream> #include <iostream>
static bool createBundle(const QString &fileName, const QStringList &fileNames) static bool createBundle(const QString &fileName, const QStringList &fileNames)

View File

@ -57,7 +57,8 @@
# include "private/qv4isel_masm_p.h" # include "private/qv4isel_masm_p.h"
#endif // V4_ENABLE_JIT #endif // V4_ENABLE_JIT
#include <QtCore> #include <QtCore/QCoreApplication>
#include <QtCore/QFile>
#include <private/qqmljsengine_p.h> #include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h> #include <private/qqmljslexer_p.h>
#include <private/qqmljsparser_p.h> #include <private/qqmljsparser_p.h>