Merge remote-tracking branch 'origin/3.2'

2014-06-30 12:03:41 +02:00
parent 73ef6d1083 398872bcdc
commit 142f48e340
129 changed files with 690 additions and 1339 deletions
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -49,7 +49,6 @@
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <texteditor/basetextdocument.h>
-#include <utils/function.h>
 #include <utils/hostosinfo.h>

 #include <QDir>