Changeset 606 for trunk/src

Timestamp:

Feb 26, 2010, 1:59:52 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed 4.51->4.6.1 regression: Inconsistent behavior of drive names in file dialogs due to not always stripping the terminating slash out.

Location:

trunk/src/gui/dialogs

Files:

• qfileinfogatherer.cpp (modified) (1 diff)
• qfilesystemmodel.cpp (modified) (1 diff)

trunk/src/gui/dialogs/qfileinfogatherer.cpp

@@ -286 +286 @@
         return drive.fileName();
 #endif
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
     if (driveName.endsWith(QLatin1Char('/')))
         driveName.chop(1);

trunk/src/gui/dialogs/qfilesystemmodel.cpp

@@ -379 +379 @@
 #endif
 
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
     {
         if (!pathElements.at(0).contains(QLatin1String(":"))) {