diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2013-06-05 16:47:39 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-07 20:42:04 (GMT) |
| commit | 264f201136c4fffeaa131a9ae562187ad2ef45ad (patch) | |
| tree | 6dda30c9d3b0752f566af501999311f1d1970b15 | |
| parent | 0529dc9b2542dcb46c2e2cc1a3422fc83c6ae6ef (diff) | |
| download | Qt-264f201136c4fffeaa131a9ae562187ad2ef45ad.zip Qt-264f201136c4fffeaa131a9ae562187ad2ef45ad.tar.gz Qt-264f201136c4fffeaa131a9ae562187ad2ef45ad.tar.bz2 | |
Fix for OS X QFileDialog showing bundle as directory
Also check if the selectedFile is a bundle to correctly
set currentDir.
This fix does not apply to Qt 5 because QFileDialog has
been reimplemented differently and this file does not
exist anymore.
Task-number: QTBUG-31562
Change-Id: I145108647dd613cb529bb65bc6c7191154dab5b8
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index 40fca76..77a2ac5 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -170,7 +170,7 @@ QT_USE_NAMESPACE mSelectedNameFilter = new QStringList([self findStrippedFilterWithVisualFilterName:selectedVisualNameFilter]); QFileInfo sel(selectFile); - if (sel.isDir()){ + if (sel.isDir() && !sel.isBundle()){ mCurrentDir = [qt_mac_QStringToNSString(sel.absoluteFilePath()) retain]; mCurrentSelection = new QString; } else { |