diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-08 09:37:01 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-05-12 12:12:45 +0200 |
| commit | e90b0c128e33dfe7debf4ffce79aedf57ab07ecf (patch) | |
| tree | 4b0786037adb6ae14c1c8dcace012abf365f29ee /src/plugins/android | |
| parent | 372fc953cd717817b133dbf82b04fd5709da90f1 (diff) | |
| download | qt-creator-e90b0c128e33dfe7debf4ffce79aedf57ab07ecf.tar.gz | |
Android/Ant selection: Work around file dialog bug on Mac
Task-number: QTCREATORBUG-12184
Change-Id: I2cb7c1549fc2201d4fbe163eb321b0ef11cc8a06
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 1ed454a904..b13b560f9f 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -424,6 +424,10 @@ void AndroidSettingsWidget::browseAntLocation() if (Utils::HostOsInfo::isWindowsHost()) { dir = QDir::homePath() + QLatin1String("/ant.bat"); filter = QLatin1String("ant (ant.bat)"); + } else if (Utils::HostOsInfo::isMacHost()) { + // work around QTBUG-7739 that prohibits filters that don't start with * + dir = QLatin1String("/usr/bin/ant"); + filter = QLatin1String("ant (*ant)"); } else { dir = QLatin1String("/usr/bin/ant"); filter = QLatin1String("ant (ant)"); |