Ticket #205: foldernavigationwidget.diff

foldernavigationwidget.cpp

@@ -80 +80 @@
 private:
 #if defined(Q_OS_UNIX)
     const QVariant m_root;
+#endif
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     const QVariant m_dotdot;
 #endif
     const QVariant m_dot;
@@ -89 +91 @@
     QSortFilterProxyModel(parent),
 #if defined(Q_OS_UNIX)
     m_root(QString(QLatin1Char('/'))),
+#endif
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     m_dotdot(QLatin1String("..")),
 #endif
     m_dot(QString(QLatin1Char('.')))
@@ -102 +106 @@
     if (sourceModel()->data(parent) == m_root && fileName == m_dotdot)
         return false;
 #endif
+
+#if defined(Q_OS_OS2)
+    // Some (not all !!!) file systems on OS/2 report ".." as hidden entry in root
+    // directories. We disallow going up to "My computer" to achieve consitent behavior.
+    if (fileName == m_dotdot && QDir(sourceModel()->data(parent).toString()).isRoot())
+        return false;
+#endif
+
     return fileName != m_dot;
 }