diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-29 10:30:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-29 10:31:12 +0200 |
| commit | 0aecf9c19548f9324cb65ca6da5b3514a1ff3fda (patch) | |
| tree | 6538ab6c9906de772796d7252fa4fc76827a879d | |
| parent | 705935352003399fc9e8f61e8ad291ca70546ed0 (diff) | |
| parent | 34d897165dddfde4d62037f1da85d41c1546406d (diff) | |
| download | qt-creator-0aecf9c19548f9324cb65ca6da5b3514a1ff3fda.tar.gz | |
Merge remote-tracking branch 'origin/3.1' into 3.2
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp | 1 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljscodeformatter.h | 1 | ||||
| -rw-r--r-- | src/libs/utils/tooltip/tipcontents.h | 1 | ||||
| -rw-r--r-- | src/shared/qtsingleapplication/qtlocalpeer.cpp | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp index 9c08c81029..43047f383a 100644 --- 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 { diff --git a/src/libs/qmljs/qmljscodeformatter.h b/src/libs/qmljs/qmljscodeformatter.h index 0652e5f0c2..482fb103d6 100644 --- 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; diff --git a/src/libs/utils/tooltip/tipcontents.h b/src/libs/utils/tooltip/tipcontents.h index 5cac25ee19..897a8e46e1 100644 --- 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 { diff --git a/src/shared/qtsingleapplication/qtlocalpeer.cpp b/src/shared/qtsingleapplication/qtlocalpeer.cpp index 09c69ce525..33cca898a0 100644 --- 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) |