From ac186ff7aeec9b3585f42b724682cc314b4cf565 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 26 Sep 2012 16:21:11 +0200
Subject: [PATCH] QmlDesigner: final compile fixes for 2.6 on Qt 5

Change-Id: Iba13f1b03a641f913d69822ddd623d6bfe38825f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
 share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h | 1 +
 .../qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h  | 1 +
 .../qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h | 1 +
 share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h  | 1 +
 share/qtcreator/qml/qmlpuppet/commands/tokencommand.h            | 1 +
 share/qtcreator/qml/qmlpuppet/container/instancecontainer.h      | 1 +
 share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h      | 1 +
 src/plugins/qmldesigner/meegoplugin/meegoplugin.h                | 1 -
 8 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
index 8741a82afe0..0b52d0291d4 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
@@ -32,6 +32,7 @@
 #define CHANGENODESOURCECOMMAND_H
 
 #include <QMetaType>
+#include <QDataStream>
 
 namespace QmlDesigner {
 
diff --git a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
index 24c0073142f..2ee66be5168 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
@@ -33,6 +33,7 @@
 
 #include <QMetaType>
 #include <QVector>
+#include <QDataStream>
 
 namespace QmlDesigner {
 
diff --git a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
index 80cfa2ec8f6..16f6a036ed5 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
@@ -32,6 +32,7 @@
 #define COMPONENTCOMPLETEDCOMMAND_H
 #include <QMetaType>
 #include <QVector>
+#include <QDataStream>
 
 namespace QmlDesigner {
 
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
index d20a5f8d63e..1c0b4c2efba 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
@@ -33,6 +33,7 @@
 
 #include <QMetaType>
 #include <QVector>
+#include <QDataStream>
 
 #include "instancecontainer.h"
 
diff --git a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
index e79c4d13669..20e0f8dbdf1 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
@@ -34,6 +34,7 @@
 
 #include <QMetaType>
 #include <QVector>
+#include <QDataStream>
 
 namespace QmlDesigner {
 
diff --git a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
index d7874dd1ddd..83abc8e963e 100644
--- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
@@ -33,6 +33,7 @@
 
 #include <qmetatype.h>
 #include <QString>
+#include <QDataStream>
 
 namespace QmlDesigner {
 
diff --git a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
index cb68f996226..2ea6b00dd5d 100644
--- a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
@@ -32,6 +32,7 @@
 #define REPARENTCONTAINER_H
 
 #include <qmetatype.h>
+#include <QDataStream>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
index 9b8cbbf9bf3..5e82b17e762 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
@@ -32,7 +32,6 @@
 #define MEEGOPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <qdeclarative.h>
 
 namespace QmlDesigner {