From 50f8133a1a1eb434abafcca5335be706d4f0b694 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Sun, 9 Mar 2014 23:27:34 +0200
Subject: [PATCH] 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>
---
 src/quick/items/qquickspriteengine.cpp             | 2 +-
 src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp | 2 +-
 tools/qml/conf.h                                   | 3 ++-
 tools/qml/main.cpp                                 | 3 +++
 tools/qmlbundle/main.cpp                           | 2 +-
 tools/qmljs/main.cpp                               | 3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index aa93d31cf7..e5bb577344 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -46,7 +46,7 @@
 #include <QDebug>
 #include <QPainter>
 #include <QSet>
-#include <QtGui>
+#include <QtGui/qopengl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp b/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp
index 2849eff304..9ff0971774 100644
--- a/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp
+++ b/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore>
+#include <QtCore/QByteArray>
 #include <QtGui/QSurfaceFormat>
 
 // Duct Tape tokenizer for the purpose of parsing and rewriting
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>