diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-14 10:49:21 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-14 10:49:21 (GMT) |
| commit | a955ff70b6954c5960654065d026bec849e79f1b (patch) | |
| tree | 51d686cc71f980fbd94eb9f3442b51320b51802f | |
| parent | 6a380ebcb50573149f723f1e407f5e4bdccae651 (diff) | |
| download | Qt-a955ff70b6954c5960654065d026bec849e79f1b.zip Qt-a955ff70b6954c5960654065d026bec849e79f1b.tar.gz Qt-a955ff70b6954c5960654065d026bec849e79f1b.tar.bz2 | |
Fixed merge failure in qfsfileengine_unix.cpp.
| -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; } |