Merge remote-tracking branch 'origin/3.1' into 3.2

Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
2014-09-29 10:30:20 +02:00
parent 7059353520 34d897165d
commit 0aecf9c195
4 changed files with 4 additions and 0 deletions
--- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
@@ -30,6 +30,7 @@
 #include "addimportcontainer.h"

 #include <QDebug>
+#include <QDataStream>

 namespace QmlDesigner {

--- a/src/libs/qmljs/qmljscodeformatter.h
+++ b/src/libs/qmljs/qmljscodeformatter.h
@@ -38,6 +38,7 @@
 #include <QStack>
 #include <QList>
 #include <QVector>
+#include <QMetaObject>

 QT_BEGIN_NAMESPACE
 class QTextDocument;
--- a/src/libs/utils/tooltip/tipcontents.h
+++ b/src/libs/utils/tooltip/tipcontents.h
@@ -34,6 +34,7 @@

 #include <QString>
 #include <QColor>
+#include <QWidget>

 namespace Utils {

--- a/src/shared/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/shared/qtsingleapplication/qtlocalpeer.cpp
@@ -30,6 +30,7 @@
 #include "qtlocalpeer.h"

 #include <QCoreApplication>
+#include <QDataStream>
 #include <QTime>

 #if defined(Q_OS_WIN)