Changeset 185

Timestamp:

04/03/08 22:39:42 (5 months ago)

Author:

dmik

Message:

dialogs/QFileDialog: Fixed: On some file systems and/or drives, '..' may be marked as hidden in directories that are one level away from root, but we never want to hide '..' [contributed by rudi].

Files:

• trunk/src/dialogs/qfiledialog.cpp (modified) (3 diffs)

trunk/src/dialogs/qfiledialog.cpp

@@ -4599 +4599 @@
     // stop any pending operations
     d->url.stop();
-    
+
     if ( i == QDialog::Accepted && (d->mode == ExistingFile || d->mode == ExistingFiles) ) {
         QStringList selection = selectedFiles();
@@ -5889 +5889 @@
         }
 #elif defined(Q_OS_OS2)
-        if ( !bShowHiddenFiles ) {
+    // '..' may be marked as hidden in directories that are one level away from
+    // root on some file systems and/or drives, but we never want to hide '..'
+        if ( !bShowHiddenFiles && inf.name() != ".." ) {
             if ( d->url.isLocalFile() ) {
                 QString file = d->url.path();
@@ -5901 +5903 @@
                     continue;
             }
-        }
+        }
 #else
         if ( !bShowHiddenFiles && inf.name() != ".." ) {