Merge remote-tracking branch 'origin/3.2'

Conflicts: src/plugins/projectexplorer/projectexplorer.cpp Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
2014-09-29 13:40:53 +02:00
parent b2487e1683 6bf9a19276
commit d008779bf7
20 changed files with 312 additions and 198 deletions
--- a/src/libs/qmljs/qmljscodeformatter.h
+++ b/src/libs/qmljs/qmljscodeformatter.h
@@ -37,6 +37,7 @@
 #include <QStack>
 #include <QList>
 #include <QVector>
+#include <QMetaObject>

 QT_BEGIN_NAMESPACE
 class QTextDocument;