From 2877e3510db0cceeb4483b032fcc8f3bd61d28d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@trolltech.com>
Date: Wed, 27 Jan 2010 18:15:06 +0100
Subject: Fix regressions introduced in
 3a5eb87965b60a3e249a16dc48cb06f4759dfb1b

Caching of LinkType and BundleType is independent of other file flags.
---
 src/corelib/io/qfileinfo.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 21ff708..625098e 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -170,19 +170,19 @@ uint QFileInfoPrivate::getFileFlags(QAbstractFileEngine::FileFlags request) cons
             req &= (~QAbstractFileEngine::BundleType);
 
             cachedFlags |= CachedFileFlags;
+        }
 
-            if (request & QAbstractFileEngine::LinkType) {
-                if (!data->getCachedFlag(CachedLinkTypeFlag)) {
-                    req |= QAbstractFileEngine::LinkType;
-                    cachedFlags |= CachedLinkTypeFlag;
-                }
+        if (request & QAbstractFileEngine::LinkType) {
+            if (!data->getCachedFlag(CachedLinkTypeFlag)) {
+                req |= QAbstractFileEngine::LinkType;
+                cachedFlags |= CachedLinkTypeFlag;
             }
+        }
 
-            if (request & QAbstractFileEngine::BundleType) {
-                if (!data->getCachedFlag(CachedBundleTypeFlag)) {
-                    req |= QAbstractFileEngine::BundleType;
-                    cachedFlags |= CachedBundleTypeFlag;
-                }
+        if (request & QAbstractFileEngine::BundleType) {
+            if (!data->getCachedFlag(CachedBundleTypeFlag)) {
+                req |= QAbstractFileEngine::BundleType;
+                cachedFlags |= CachedBundleTypeFlag;
             }
         }
     }
-- 
cgit v0.12