diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-08-14 12:26:39 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-08-14 12:26:39 (GMT) |
| commit | 53f08a35f50f41fe0151b0f1f8334332120b8826 (patch) | |
| tree | 2fd859840bab993973be4643783f58eaad16fdb7 /src | |
| parent | 2c6d744c6d9ab0b6af9734741404d4fb7e0e974e (diff) | |
| parent | 388460b7d8c16468aca9799b4b0ce4ee55810ede (diff) | |
| download | Qt-53f08a35f50f41fe0151b0f1f8334332120b8826.zip Qt-53f08a35f50f41fe0151b0f1f8334332120b8826.tar.gz Qt-53f08a35f50f41fe0151b0f1f8334332120b8826.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfsfileengine_unix.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 2b7a3f7..620d82f 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -803,20 +803,21 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const if (!(ret & RootFlag) && !d->isSymlink()) if(_q_isSymbianHidden(d->filePath, ret & DirectoryType)) ret |= HiddenFlag; -#endif +#else if (d->filePath == QLatin1String("/")) { ret |= RootFlag; } else { QString baseName = fileName(BaseName); if ((baseName.size() > 1 && baseName.at(0) == QLatin1Char('.') && baseName.at(1) != QLatin1Char('.')) -#if !defined(QWS) && defined(Q_OS_MAC) +# if !defined(QWS) && defined(Q_OS_MAC) || _q_isMacHidden(d->filePath) -#endif +# endif ) { ret |= HiddenFlag; } } +#endif } return ret; } |