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

Android: Don't search for ant.bat on linux

Browse Source 
Change-Id: Ia149f8eed040d5fe370286025cf76f7a6e7f47db
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Daniel Teske
2013-11-15 14:12:46 +01:00
parent 127c99ff01
commit 899dac18f7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidsettingswidget.cpp
View File

@@ -316,7 +316,11 @@ void AndroidSettingsWidget::searchForAnt(const QString &location)
foreach (const QString &file, parentFolder.entryList()) {
if (file.startsWith(QLatin1String("apache-ant"))) {
Utils::FileName ant = Utils::FileName::fromString(parentFolder.absolutePath());
ant.appendPath(file).appendPath(QLatin1String("bin")).appendPath(QLatin1String("ant.bat"));
ant.appendPath(file).appendPath(QLatin1String("bin"));
if (Utils::HostOsInfo::isWindowsHost())
ant.appendPath(QLatin1String("ant.bat"));
else
ant.appendPath(QLatin1String("ant"));
if (ant.toFileInfo().exists()) {
m_androidConfig.antLocation = ant;
m_ui->AntLocationLineEdit->setText(ant.toUserOutput());