diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-04-07 11:19:11 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-08 02:09:49 (GMT) |
| commit | de684d1de146db0e578d2fefb80ca32b19680d73 (patch) | |
| tree | 86a20ec445a04203b1c72acba0467da8e7e9bae4 | |
| parent | 6beee76eae6420b16095bdfbe60b188b18e4468f (diff) | |
| download | Qt-de684d1de146db0e578d2fefb80ca32b19680d73.zip Qt-de684d1de146db0e578d2fefb80ca32b19680d73.tar.gz Qt-de684d1de146db0e578d2fefb80ca32b19680d73.tar.bz2 | |
BT: QFileDialog: A folder with a name containing diacritic is disabled on Mac OS X - cocoa
The filename as NSString that we get from Cocoa does not have
the correct file system encoding. This means that certain characters are
implemented differently than what e.g. QFile::encoded returns. This fix
normalizes the string from cocoa before using it.
Task-number: 249928
Reviewed-by: Trenton Schulz
(cherry picked from commit 179fafcc370c907a6070c7150695d446255e68d1)
| -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 4c13d01..90af9fc 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -278,7 +278,7 @@ QT_USE_NAMESPACE { Q_UNUSED(sender); QString qtFileName = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename); - QFileInfo info(qtFileName); + QFileInfo info(qtFileName.normalized(QT_PREPEND_NAMESPACE(QString::NormalizationForm_C))); QString path = info.absolutePath(); if (path != *mLastFilterCheckPath){ *mLastFilterCheckPath = path; |