Merge remote-tracking branch 'origin/3.4'

2015-03-24 07:40:21 +01:00
parent 674b798350 044eeacde5
commit 9790d8aa00
103 changed files with 1018 additions and 1167 deletions
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -45,8 +45,6 @@
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>

-#include <utils/pathchooser.h>
-
 #include <QFile>
 #include <QTextStream>
 #include <QProcess>