From 3affbed2b6120ba33b9cd2b160da0602b810ba26 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 5 Mar 2014 12:34:23 +0100 Subject: [PATCH] Android: Fix parameters for the Ant script file dialog Making sure that the file name field has "ant.bat" set, and that the filtering really works. This patch also ensures that native file separators are shown. Task-Number: QTCREATORBUG-11628 Change-Id: Ibab8c145d0b832e5ad2e2ff62a81818e4044f13e Reviewed-by: Daniel Teske --- src/plugins/android/androidsettingswidget.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index de2894c5dfc..085a3bb412c 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -414,19 +414,19 @@ void AndroidSettingsWidget::browseNDKLocation() void AndroidSettingsWidget::browseAntLocation() { QString dir; - QString antApp; + QString filter; if (Utils::HostOsInfo::isWindowsHost()) { - dir = QDir::homePath(); - antApp = QLatin1String("ant.bat"); + dir = QDir::homePath() + QLatin1String("/ant.bat"); + filter = QLatin1String("ant (ant.bat)"); } else { dir = QLatin1String("/usr/bin/ant"); - antApp = QLatin1String("ant"); + filter = QLatin1String("ant (ant)"); } const QString file = - QFileDialog::getOpenFileName(this, tr("Select ant Script"), dir, antApp); + QFileDialog::getOpenFileName(this, tr("Select ant Script"), dir, filter); if (!file.length()) return; - m_ui->AntLocationLineEdit->setText(file); + m_ui->AntLocationLineEdit->setText(QDir::toNativeSeparators(file)); antLocationEditingFinished(); }