summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfsfileengine_unix.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-05-19 13:07:18 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-05-19 13:07:18 (GMT)
commitd7fda9c7aef17ed79fd656f197fb179acb4ec54a (patch)
tree10d34a0e1159597c954c0446f028beaa0dd20394 /src/corelib/io/qfsfileengine_unix.cpp
parentae85bab1ec5d66d4bfb628da4f0e5514dc85f5a5 (diff)
parent16887d14b975c4740f037366dc7e45d59731fb47 (diff)
downloadQt-d7fda9c7aef17ed79fd656f197fb179acb4ec54a.zip
Qt-d7fda9c7aef17ed79fd656f197fb179acb4ec54a.tar.gz
Qt-d7fda9c7aef17ed79fd656f197fb179acb4ec54a.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/io/qfsfileengine_unix.cpp')
-rw-r--r--src/corelib/io/qfsfileengine_unix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 4747bcc..72ea065 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -1045,7 +1045,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();