summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPino Toscano <toscano.pino@tiscali.it>2011-05-05 17:19:28 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-05 17:20:56 (GMT)
commitc8812fe6e642520532d65744caefcea790d59de8 (patch)
tree1b845659060a7815622203be71de5d588fea179f
parent027605f67f73c8021c1ae604adad298599785a79 (diff)
downloadQt-c8812fe6e642520532d65744caefcea790d59de8.zip
Qt-c8812fe6e642520532d65744caefcea790d59de8.tar.gz
Qt-c8812fe6e642520532d65744caefcea790d59de8.tar.bz2
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
... in the same way as done in the other code path. This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd). Merge-request: 1218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/corelib/io/qfilesystemengine_unix.cpp2
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