diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-18 07:46:48 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-18 07:46:48 (GMT) |
| commit | 188c14c1fd66cc2bddcf19d753caeaac0241940c (patch) | |
| tree | 3ded4f7f0dd8142dc7a00cc300ae21f98c0e8e73 /src/corelib/io | |
| parent | 547e737c4fc01fb33cb2eae8d4662b367fccb097 (diff) | |
| parent | 3a2d02f3a8f02509023dd398da77f35b9b3ad68f (diff) | |
| download | Qt-188c14c1fd66cc2bddcf19d753caeaac0241940c.zip Qt-188c14c1fd66cc2bddcf19d753caeaac0241940c.tar.gz Qt-188c14c1fd66cc2bddcf19d753caeaac0241940c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/io')
| -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; } |