From a955ff70b6954c5960654065d026bec849e79f1b Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 14 Aug 2009 13:49:21 +0300
Subject: Fixed merge failure in qfsfileengine_unix.cpp.

---
 src/corelib/io/qfsfileengine_unix.cpp | 7 ++++---
 1 file 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;
 }
-- 
cgit v0.12