From c07f6d3c8271b4e1b48cc740a428d073da185590 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 30 Oct 2013 13:23:11 +0100 Subject: [PATCH] Android: Fix double slash in ndk's ant autodetection Just use Utils::FileName, it magically does the right thing. :) Task-number: QTCREATORBUG-10542 Change-Id: Id0d508c1e7d9317fa2e4a56ae9389e909c0c3834 Reviewed-by: Robert Loehning Reviewed-by: Daniel Teske --- src/plugins/android/androidsettingswidget.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 7949c050f69..f2e7a5dc66e 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -313,10 +313,11 @@ void AndroidSettingsWidget::searchForAnt(const QString &location) QDir parentFolder = QFileInfo(location).absoluteDir(); foreach (const QString &file, parentFolder.entryList()) { if (file.startsWith(QLatin1String("apache-ant"))) { - QString ant = parentFolder.absolutePath() + QLatin1Char('/') + file + QLatin1String("/bin/ant.bat"); - if (QFileInfo(ant).exists()) { - m_androidConfig.antLocation = Utils::FileName::fromString(ant); - m_ui->AntLocationLineEdit->setText(ant); + Utils::FileName ant = Utils::FileName::fromString(parentFolder.absolutePath()); + ant.appendPath(file).appendPath(QLatin1String("bin")).appendPath(QLatin1String("ant.bat")); + if (ant.toFileInfo().exists()) { + m_androidConfig.antLocation = ant; + m_ui->AntLocationLineEdit->setText(ant.toUserOutput()); } } }