diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 09:22:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 09:22:35 (GMT) |
| commit | 62f17a11be4ff2f545148a9e14a0d4806398765a (patch) | |
| tree | db89450c30a51a3ee1d07ccc8d7b69954cbf3f87 | |
| parent | 9edf87f4a89c579de5bbb3ab0b2ff09b0629e249 (diff) | |
| parent | cee1f6454a7b52a52795590e2f793c0cd4e15ce1 (diff) | |
| download | Qt-62f17a11be4ff2f545148a9e14a0d4806398765a.zip Qt-62f17a11be4ff2f545148a9e14a0d4806398765a.tar.gz Qt-62f17a11be4ff2f545148a9e14a0d4806398765a.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Cocoa: QFileDialog: fix filename filter not applied correctly
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index fb52274..f1d3a4a 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -305,12 +305,13 @@ QT_USE_NAMESPACE QString qtFileName = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename); QFileInfo info(qtFileName.normalized(QT_PREPEND_NAMESPACE(QString::NormalizationForm_C))); QString path = info.absolutePath(); + QString name = info.fileName(); if (path != *mLastFilterCheckPath){ *mLastFilterCheckPath = path; *mQDirFilterEntryList = info.dir().entryList(*mQDirFilter); } // Check if the QDir filter accepts the file: - if (!mQDirFilterEntryList->contains(info.fileName())) + if (!mQDirFilterEntryList->contains(name)) return NO; // No filter means accept everything @@ -318,7 +319,7 @@ QT_USE_NAMESPACE return YES; // Check if the current file name filter accepts the file: for (int i=0; i<mSelectedNameFilter->size(); ++i) { - if (QDir::match(mSelectedNameFilter->at(i), qtFileName)) + if (QDir::match(mSelectedNameFilter->at(i), name)) return YES; } return NO; |