Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

2013-03-26 13:10:09 +01:00
parent 599be01a67 92207c96b7
commit 96a5245d8e
163 changed files with 110 additions and 404 deletions
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -34,6 +34,7 @@
 #include <QString>
 #include <QVector>
 #include <projectexplorer/abi.h>
+#include <utils/fileutils.h>

 QT_BEGIN_NAMESPACE
 class QSettings;
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -41,6 +41,7 @@
 #include <debugger/debuggerstartparameters.h>

 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4project.h>
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -36,6 +36,7 @@

 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>

 #include <qt4projectmanager/qt4project.h>
 #include <qtsupport/qtkitinformation.h>