diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 07:08:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 07:08:55 (GMT) |
| commit | 6c5cdeb85dba4fd850150a6221aa26ffe82166f6 (patch) | |
| tree | 91f249baf74651853d0931f2fda314d09e2d1911 /src/corelib | |
| parent | 1d9a18142eb19d5dde93b7e5c63f9be0e4caf896 (diff) | |
| parent | c8812fe6e642520532d65744caefcea790d59de8 (diff) | |
| download | Qt-6c5cdeb85dba4fd850150a6221aa26ffe82166f6.zip Qt-6c5cdeb85dba4fd850150a6221aa26ffe82166f6.tar.gz Qt-6c5cdeb85dba4fd850150a6221aa26ffe82166f6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
Massively update the hurd-g++ mkspec.
rebuild configure
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 742b05e..030b845 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -639,7 +639,7 @@ QFileSystemEntry QFileSystemEngine::currentPath() #if defined(__GLIBC__) && !defined(PATH_MAX) char *currentName = ::get_current_dir_name(); if (currentName) { - result = QFile::decodeName(QByteArray(currentName)); + result = QFileSystemEntry(QByteArray(currentName), QFileSystemEntry::FromNativePath()); ::free(currentName); } #else |