diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-20 04:51:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-20 04:51:29 (GMT) |
| commit | e484ee27f929aca738a269947237d834dab89b39 (patch) | |
| tree | 216f95598411eb4c72141308973695d5e0d8b372 /src/corelib/io/qfsfileengine_unix.cpp | |
| parent | ded29009f766a8373193d94bcb8309270f66a266 (diff) | |
| parent | d1f1f2c91f63609ca1ffad32efdd6590f9f0ce6a (diff) | |
| download | Qt-e484ee27f929aca738a269947237d834dab89b39.zip Qt-e484ee27f929aca738a269947237d834dab89b39.tar.gz Qt-e484ee27f929aca738a269947237d834dab89b39.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/io/qfsfileengine_unix.cpp')
| -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(); |