1 files changed, 37 insertions, 24 deletions

diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index e950256..bdf0909 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -49,7 +49,7 @@
 #include <qapplication.h>
 
 #ifdef Q_OS_WIN
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -296,22 +296,14 @@ static QString qt_GetLongPathName(const QString &strShortPath)
 #else
                 QString longSection = QDir::toNativeSeparators(section);
 #endif
-                QT_WA({
-                    WIN32_FIND_DATAW findData;
-                    h = ::FindFirstFileW((wchar_t *)longSection.utf16(), &findData);
-                    if (h != INVALID_HANDLE_VALUE)
-                        longPath.append(QString::fromUtf16((ushort*)findData.cFileName));
-                    } , {
-                    WIN32_FIND_DATAA findData;
-                    h = ::FindFirstFileA(section.toLocal8Bit(), &findData);
-                    if (h != INVALID_HANDLE_VALUE)
-                        longPath.append(QString::fromLocal8Bit(findData.cFileName));
-                });
-                if (h == INVALID_HANDLE_VALUE) {
+                WIN32_FIND_DATA findData;
+                h = ::FindFirstFile((wchar_t*)longSection.utf16(), &findData);
+                if (h != INVALID_HANDLE_VALUE) {
+                    longPath.append(QString::fromWCharArray(findData.cFileName));
+                    ::FindClose(h);
+                } else {
                     longPath.append(section);
                     break;
-                } else {
-                    ::FindClose(h);
                 }
             }
             if (it != constEnd)
@@ -337,7 +329,7 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
 {
     Q_Q(const QFileSystemModel);
     Q_UNUSED(q);
-    if (path.isEmpty() || path == myComputer() || path.startsWith(QLatin1String(":")))
+    if (path.isEmpty() || path == myComputer() || path.startsWith(QLatin1Char(':')))
         return const_cast<QFileSystemModelPrivate::QFileSystemNode*>(&root);
 
     // Construct the nodes up to the new root path if they need to be built
@@ -355,7 +347,7 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
     // ### TODO can we use bool QAbstractFileEngine::caseSensitive() const?
     QStringList pathElements = absolutePath.split(QLatin1Char('/'), QString::SkipEmptyParts);
     if ((pathElements.isEmpty())
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if (!defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_OS_SYMBIAN)
         && QDir::fromNativeSeparators(longPath) != QLatin1String("/")
 #endif
         )
@@ -384,9 +376,17 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
         r = translateVisibleLocation(rootNode, r);
         index = q->index(r, 0, QModelIndex());
         pathElements.pop_front();
-    } else {
-        if (!pathElements.at(0).contains(QLatin1String(":")))
-            pathElements.prepend(QDir(longPath).rootPath());
+    } else
+#endif
+
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+    {
+        if (!pathElements.at(0).contains(QLatin1String(":"))) {
+            // The reason we express it like this instead of with anonymous, temporary
+            // variables, is to workaround a compiler crash with Q_CC_NOKIAX86.
+            QString rootPath = QDir(longPath).rootPath();
+            pathElements.prepend(rootPath);
+        }
         if (pathElements.at(0).endsWith(QLatin1Char('/')))
             pathElements[0].chop(1);
     }
@@ -1408,7 +1408,7 @@ void QFileSystemModel::setIconProvider(QFileIconProvider *provider)
 {
     Q_D(QFileSystemModel);
     d->fileInfoGatherer.setIconProvider(provider);
-    qApp->processEvents();
+    QApplication::processEvents();
     d->root.updateIcon(provider, QString());
 }
 
@@ -1597,12 +1597,25 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons
     if (parentNode->children.count() == 0)
         return;
     QStringList toRemove;
+#if defined(Q_OS_SYMBIAN)
+    // Filename case must be exact in qBinaryFind below, so create a list of all lowercase names.
+    QStringList newFiles;
+    for(int i = 0; i < files.size(); i++) {
+        newFiles << files.at(i).toLower();
+    }
+#else
     QStringList newFiles = files;
+#endif
     qSort(newFiles.begin(), newFiles.end());
     QHash<QString, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
     while (i != parentNode->children.constEnd()) {
         QStringList::iterator iterator;
-        iterator = qBinaryFind(newFiles.begin(), newFiles.end(), i.value()->fileName);
+        iterator = qBinaryFind(newFiles.begin(), newFiles.end(),
+#if defined(Q_OS_SYMBIAN)
+                    i.value()->fileName.toLower());
+#else
+                    i.value()->fileName);
+#endif
         if (iterator == newFiles.end()) {
             toRemove.append(i.value()->fileName);
         }
@@ -1925,8 +1938,8 @@ bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const
     return true;
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qfilesystemmodel.cpp"
 
 #endif // QT_NO_FILESYSTEMMODEL
-
-QT_END_NAMESPACE