Forward-declare some classes in QmlJsTools.

Change-Id: I7196c1b2be093d4070c68546f13ee2ef36c2876c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

5 files changed, 12 insertions, 5 deletions

diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
index c02f00e708..03af88b55f 100644
--- a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
+++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
@@ -33,6 +33,7 @@
 #include <QPainter>
 #include <QTreeView>
 #include <QScrollBar>
+#include <QTextLayout>
 
 const char CONSOLE_LOG_BACKGROUND_COLOR[] = "#E8EEF2";
 const char CONSOLE_WARNING_BACKGROUND_COLOR[] = "#F6F4EB";
diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.h b/src/plugins/qmljstools/qmlconsoleitemdelegate.h
index d4e2dd9857..c9b7c8118d 100644
--- a/src/plugins/qmljstools/qmlconsoleitemdelegate.h
+++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.h
@@ -35,7 +35,8 @@
 #include "qmlconsolemanager.h"
 
 #include <QStyledItemDelegate>
-#include <QTextLayout>
+
+QT_FORWARD_DECLARE_CLASS(QTextLayout)
 
 namespace QmlJSTools {
 namespace Internal {
diff --git a/src/plugins/qmljstools/qmlconsoleitemmodel.cpp b/src/plugins/qmljstools/qmlconsoleitemmodel.cpp
index a445d062d8..002d836a8a 100644
--- a/src/plugins/qmljstools/qmlconsoleitemmodel.cpp
+++ b/src/plugins/qmljstools/qmlconsoleitemmodel.cpp
@@ -32,6 +32,7 @@
 #include <utils/qtcassert.h>
 
 #include <QFontMetrics>
+#include <QFont>
 
 using namespace QmlJS;
 
diff --git a/src/plugins/qmljstools/qmlconsoleitemmodel.h b/src/plugins/qmljstools/qmlconsoleitemmodel.h
index ff55b9917d..4caf2409a4 100644
--- a/src/plugins/qmljstools/qmlconsoleitemmodel.h
+++ b/src/plugins/qmljstools/qmlconsoleitemmodel.h
@@ -34,7 +34,8 @@
 
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
-#include <QFont>
+
+QT_FORWARD_DECLARE_CLASS(QFont)
 
 namespace QmlJSTools {
 namespace Internal {
diff --git a/src/plugins/qmljstools/qmljsbundleprovider.h b/src/plugins/qmljstools/qmljsbundleprovider.h
index f02a6e3fe7..29536acffb 100644
--- a/src/plugins/qmljstools/qmljsbundleprovider.h
+++ b/src/plugins/qmljstools/qmljsbundleprovider.h
@@ -31,9 +31,7 @@
 #define QMLJSBUNDLEPROVIDER_H
 
 #include <QObject>
-
-#include <qmljs/qmljsbundle.h>
-#include <qmljs/qmljsdocument.h>
+#include <QHash>
 
 #include "qmljstools_global.h"
 
@@ -43,6 +41,11 @@ class Project;
 class Target;
 }
 
+namespace QmlJS {
+class QmlLanguageBundles;
+class QmlBundle;
+} // namespace QmlJS
+
 namespace QmlJSTools {
 
 class QMLJSTOOLS_EXPORT IBundleProvider : public QObject