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

Android: Use '/' in INSTALL_ROOT if sh.exe is in PATH

Browse Source 
Task-number: QTBUG-31147

Change-Id: Ifdeef2fa96668fdb482fd613eb8766c1ff5e3afd
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Daniel Teske
2013-06-04 16:42:26 +02:00
parent b6e9ebb7e6
commit 8011d0c32b
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -31,6 +31,11 @@
#include "androidmanager.h" #include "androidmanager.h"
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/target.h>
#include <projectexplorer/buildconfiguration.h>
#include <utils/hostosinfo.h>
#include <QDir>
using namespace Android::Internal; using namespace Android::Internal;
@@ -50,6 +55,14 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::
bool AndroidPackageInstallationStep::init() bool AndroidPackageInstallationStep::init()
{ {
setUserArguments(QString::fromLatin1("INSTALL_ROOT=\"%1\" install").arg(AndroidManager::dirPath(target()).toUserOutput())); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
if (!bc)
bc = target()->activeBuildConfiguration();
QString dirPath = AndroidManager::dirPath(target()).toString();
if (Utils::HostOsInfo::isWindowsHost())
if (bc->environment().searchInPath(QLatin1String("sh.exe")).isEmpty())
dirPath = QDir::toNativeSeparators(dirPath);
setUserArguments(QString::fromLatin1("INSTALL_ROOT=\"%1\" install").arg(dirPath));
return MakeStep::init(); return MakeStep::init();
} }