diff options
author | Ritt Konstantin <ritt.ks@gmail.com> | 2009-12-23 14:56:34 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-12-23 14:56:34 +0100 |
commit | e416e8b439c7949faeeda5fda6edae2211e63eb2 (patch) | |
tree | 63f566ba8acfed39e2a0cae484ec93a2092f139a /src/corelib/io/qfsfileengine_win.cpp | |
parent | d27006b2a853924a11aa2bc45590c2c5c5fcfafa (diff) | |
download | qt4-tools-e416e8b439c7949faeeda5fda6edae2211e63eb2.tar.gz |
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
as discussed at #qt-labs special dirs should be hidden on unix
to preserve qt3-like behavior
unhiding those dirs was not a good idea and now i do revert of my changes
Merge-request: 1894
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/corelib/io/qfsfileengine_win.cpp')
-rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index a6cb5a9f7a..a7719a8f7e 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1595,13 +1595,10 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(QAbstractFileEngine::Fil ret |= LocalDiskFlag; if (d->doStat()) { ret |= ExistsFlag; - if (d->filePath == QLatin1String("/") || isDriveRoot(d->filePath) || isUncRoot(d->filePath)) { + if (d->filePath == QLatin1String("/") || isDriveRoot(d->filePath) || isUncRoot(d->filePath)) ret |= RootFlag; - } else if (d->fileAttrib & FILE_ATTRIBUTE_HIDDEN) { - QString baseName = fileName(BaseName); - if (baseName != QLatin1String(".") && baseName != QLatin1String("..")) - ret |= HiddenFlag; - } + else if (d->fileAttrib & FILE_ATTRIBUTE_HIDDEN) + ret |= HiddenFlag; } } return ret; |