Changeset 1134 for trunk/src

Timestamp:

Mar 12, 2013, 10:48:53 PM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Make QDir::absoluteFilePath() kLIBC path rewrite aware. Extends r1112.

This fix makes it possible to use paths like /@unixroot for e.g. Qt system directories.

File:

• trunk/src/corelib/io/qdir.cpp (modified) (3 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -62 +62 @@
 #include <stdlib.h>
 
+
+
+
+
+
+
 QT_BEGIN_NAMESPACE
 
@@ -715 +721 @@
     bool curDirOnDriveRelative = false;
     if (isAbsolutePath(fn)) {
+
+
+
+
+
+
+
+
         // filter out not really absolute cases
         QChar ch0, ch1, ch2;
@@ -737 +751 @@
             ret = QFileInfo(fn).absoluteFilePath();
         } else {
+
             if (curDriveRelative)
                 ret = ret.left(2); // only take the drive name from this QDir