summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-04-07 11:19:11 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-04-07 11:44:42 (GMT)
commit179fafcc370c907a6070c7150695d446255e68d1 (patch)
tree2d37039bcd9acec2f414e978be7b230371c3d068
parentacff913a6287ad50b0ac782d817d51072ccb479c (diff)
downloadQt-179fafcc370c907a6070c7150695d446255e68d1.zip
Qt-179fafcc370c907a6070c7150695d446255e68d1.tar.gz
Qt-179fafcc370c907a6070c7150695d446255e68d1.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
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm2
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;