summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-02-13 14:09:18 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-13 16:53:49 (GMT)
commit608a329a575479cacbc9971de3f67cfa9e931a46 (patch)
tree865209106bd5eb3461369c4bfeabbe1f76b79898
parented792d7b7cd64bce0168b4e509337a8e0408300e (diff)
downloadQt-608a329a575479cacbc9971de3f67cfa9e931a46.zip
Qt-608a329a575479cacbc9971de3f67cfa9e931a46.tar.gz
Qt-608a329a575479cacbc9971de3f67cfa9e931a46.tar.bz2
Mac: Fix file dialog filters when filter doesn't start with '*'
Task-number: QTBUG-17326 Change-Id: Ie32f2807e64aa9c90b2e7d75adcd2aef67649225 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 8fea8b1..b7ba424 100644
--- a/src/gui/dialogs/qfiledialog_mac.mm
+++ b/src/gui/dialogs/qfiledialog_mac.mm
@@ -334,7 +334,8 @@ QT_USE_NAMESPACE
}
}
- QString qtFileName = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename);
+ QString qtFileName
+ = QFileInfo(QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename)).fileName();
// No filter means accept everything
bool nameMatches = mSelectedNameFilter->isEmpty();
// Check if the current file name filter accepts the file: