From c4c9b4457f0f760c1bf46dd8a309ab76eb128c1d Mon Sep 17 00:00:00 2001
From: aavit <qt-info@nokia.com>
Date: Mon, 7 Sep 2009 11:14:12 +0200
Subject: Fix for qfileinfo autotest: LocalDiskFile set also for non-existing
file
Change 53576b4d3c3e7325d01efba6c4da80299492f2db introduced the
behaviour that QFSFileEngine sets LocalDiskFlag regardless of whether
the file exists or not, but it just did it for Windows. This change
makes fsengine for unix/mac behave likewise.
Reviewed-by: trustme
---
src/corelib/io/qfsfileengine_unix.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 022211c..50b4af7 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -731,6 +731,8 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
}
QAbstractFileEngine::FileFlags ret = 0;
+ if (type & FlagsMask)
+ ret |= LocalDiskFlag;
bool exists = d->doStat();
if (!exists && !d->isSymlink())
return ret;
@@ -796,7 +798,6 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
}
}
if (type & FlagsMask) {
- ret |= LocalDiskFlag;
if (exists)
ret |= ExistsFlag;
#if defined(Q_OS_SYMBIAN)
--
cgit v0.12