Small include header fixes

QtXmlStream classes live in QtCore, not QtXml. Also add a few headers
that are not implicitly included in Qt 5 any more. This greatly eases
transition to Qt 5 which not having any side effects on the Qt 4 build.

Change-Id: I1293ef4360015b885dcea8c4099e8e5b9e254c91
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

src/libs/utils/qtcolorbutton.cpp

@@ -37,6 +37,7 @@
 #include <QtGui/QColorDialog>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QPainter>
+#include <QtGui/QDrag>
 
 namespace Utils {
 

src/plugins/coreplugin/mainwindow.cpp

@@ -93,6 +93,7 @@
 #include <QtCore/QUrl>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
+#include <QtCore/QMimeData>
 
 #include <QtGui/QApplication>
 #include <QtGui/QCloseEvent>

src/plugins/debugger/watchwindow.cpp

@@ -52,6 +52,7 @@
 #include <QtCore/QMetaObject>
 #include <QtCore/QMetaProperty>
 #include <QtCore/QVariant>
+#include <QtCore/QMimeData>
 
 #include <QtGui/QApplication>
 #include <QtGui/QPalette>

src/plugins/designer/formwindoweditor.cpp

@@ -164,7 +164,8 @@ bool FormWindowEditor::open(QString *errorString, const QString &fileName, const
     form->setFileName(absfileName);
 #if QT_VERSION >= 0x050000
     const QByteArray contentsBA = contents.toUtf8();
-    QBuffer str(&contentsBA);
+    QBuffer str;
+    str.setData(contentsBA);
     str.open(QIODevice::ReadOnly);
     if (!form->setContents(&str, errorString))
         return false;

src/plugins/help/centralwidget.h

@@ -41,6 +41,7 @@ QT_FORWARD_DECLARE_CLASS(QEvent)
 QT_FORWARD_DECLARE_CLASS(QAction)
 QT_FORWARD_DECLARE_CLASS(QStackedWidget)
 QT_FORWARD_DECLARE_CLASS(QFocusEvent)
+QT_FORWARD_DECLARE_CLASS(QPrinter)
 
 namespace Help {
     namespace Internal {

src/plugins/help/xbelsupport.h

@@ -34,7 +34,7 @@
 #define XBELSUPPORT_H
 
 #include <QtGui/QIcon>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 QT_FORWARD_DECLARE_CLASS(QIODevice)
 QT_FORWARD_DECLARE_CLASS(QStandardItem)

src/plugins/madde/maemoqemuruntimeparser.h

@@ -35,7 +35,7 @@
 #include "maemoqemuruntime.h"
 
 #include <QtCore/QString>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 namespace QtSupport {
 class BaseQtVersion;

src/plugins/qmljseditor/qmloutlinemodel.cpp

@@ -45,6 +45,7 @@
 #include <coreplugin/icore.h>
 #include <QtCore/QDebug>
 #include <QtCore/QTime>
+#include <QtCore/QMimeData>
 #include <typeinfo>
 
 using namespace QmlJS;

src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h

@@ -36,7 +36,7 @@
 #include <projectexplorer/ioutputparser.h>
 
 #include <QtCore/QDir>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 namespace ProjectExplorer {
 class TaskHub;

src/plugins/subversion/subversionplugin.cpp

@@ -72,13 +72,13 @@
 #include <QtCore/QtPlugin>
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QUrl>
+#include <QtCore/QXmlStreamReader>
 #include <QtGui/QAction>
 #include <QtGui/QFileDialog>
 #include <QtGui/QMainWindow>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
 #include <QtGui/QInputDialog>
-#include <QtXml/QXmlStreamReader>
 #include <limits.h>
 
 namespace Subversion {

src/plugins/texteditor/basetexteditor.cpp

@@ -78,6 +78,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QTimeLine>
 #include <QtCore/QTime>
+#include <QtCore/QMimeData>
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QApplication>
 #include <QtGui/QKeyEvent>

src/plugins/texteditor/colorscheme.cpp

@@ -38,7 +38,7 @@
 
 #include <QtCore/QFile>
 #include <QtCore/QCoreApplication>
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
 
 using namespace TextEditor;
 

src/plugins/texteditor/generichighlighter/manager.cpp

@@ -61,12 +61,12 @@
 #include <QtCore/QtConcurrentMap>
 #include <QtCore/QUrl>
 #include <QtCore/QSet>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QXmlStreamAttributes>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QMessageBox>
 #include <QtXml/QXmlSimpleReader>
 #include <QtXml/QXmlInputSource>
-#include <QtXml/QXmlStreamReader>
-#include <QtXml/QXmlStreamAttributes>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
 #include <QtAlgorithms>