diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-13 08:26:31 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-13 08:26:31 (GMT) |
| commit | f9afc51f96b2b09d8be7fcd9bf080d1144643273 (patch) | |
| tree | 9cfaefbd6f58d3bb47ab3be564bd74df0ff65ccb /src/corelib/io | |
| parent | 5cbaaa1a8baf14b66efe89fe967a3e966dac659c (diff) | |
| parent | 03415f5db33ee1d8af15b924f84b547a9ed8020b (diff) | |
| download | Qt-f9afc51f96b2b09d8be7fcd9bf080d1144643273.zip Qt-f9afc51f96b2b09d8be7fcd9bf080d1144643273.tar.gz Qt-f9afc51f96b2b09d8be7fcd9bf080d1144643273.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfsfileengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 8a0a3f5..7a6a85b 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -780,7 +780,7 @@ QString QFSFileEngine::fileName(FileName file) const #endif if (len > 0) { QString ret; - if (S_ISDIR(d->st.st_mode) && s[0] != '/') { + if (d->doStat() && S_ISDIR(d->st.st_mode) && s[0] != '/') { QDir parent(d->filePath); parent.cdUp(); ret = parent.path(); |