feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
This commit is contained in:
Eike Ziller
2014-09-29 10:30:20 +02:00
parent 7059353520 34d897165d
commit 0aecf9c195
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
View File

@@ -30,6 +30,7 @@
#include "addimportcontainer.h" #include "addimportcontainer.h"
#include <QDebug> #include <QDebug>
#include <QDataStream>
namespace QmlDesigner { namespace QmlDesigner {

1
src/libs/qmljs/qmljscodeformatter.h
View File

@@ -38,6 +38,7 @@
#include <QStack> #include <QStack>
#include <QList> #include <QList>
#include <QVector> #include <QVector>
#include <QMetaObject>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QTextDocument; class QTextDocument;

1
src/libs/utils/tooltip/tipcontents.h
View File

@@ -34,6 +34,7 @@
#include <QString> #include <QString>
#include <QColor> #include <QColor>
#include <QWidget>
namespace Utils { namespace Utils {

1
src/shared/qtsingleapplication/qtlocalpeer.cpp
View File

@@ -30,6 +30,7 @@
#include "qtlocalpeer.h" #include "qtlocalpeer.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDataStream>
#include <QTime> #include <QTime>
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)