diff options
| author | João Abecasis <joao@trolltech.com> | 2010-01-27 17:15:06 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@trolltech.com> | 2010-01-27 19:29:50 (GMT) |
| commit | 2877e3510db0cceeb4483b032fcc8f3bd61d28d5 (patch) | |
| tree | 5782b8687057266042e7d16b13cc00c07efe95ac /src/corelib | |
| parent | b88141c7505e10ffaa25cc20b444da8e2cc6d9c7 (diff) | |
| download | Qt-2877e3510db0cceeb4483b032fcc8f3bd61d28d5.zip Qt-2877e3510db0cceeb4483b032fcc8f3bd61d28d5.tar.gz Qt-2877e3510db0cceeb4483b032fcc8f3bd61d28d5.tar.bz2 | |
Fix regressions introduced in 3a5eb87965b60a3e249a16dc48cb06f4759dfb1b
Caching of LinkType and BundleType is independent of other file flags.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 20 |
1 files 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; } } } |