summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-06 13:13:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-06 13:13:06 (GMT)
commitafc0497c48ce63f57768960520dee6d6e29afcad (patch)
tree2c2c35f5f377e27ef5c0d7ddd18070212837e6cd
parent82643a0f0bd707613b3678a9c8f1b30295d24c12 (diff)
parentbf69c7e0af67ec877da4fee244386e538fa1c01d (diff)
downloadQt-afc0497c48ce63f57768960520dee6d6e29afcad.zip
Qt-afc0497c48ce63f57768960520dee6d6e29afcad.tar.gz
Qt-afc0497c48ce63f57768960520dee6d6e29afcad.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix incorrect QFileInfo permissions on windows
-rw-r--r--src/corelib/io/qfilesystemengine_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index 031d64b..3296bab 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -692,7 +692,7 @@ bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSyst
if (what & QFileSystemMetaData::UserWritePermission) {
if (::_waccess((wchar_t*)entry.nativeFilePath().utf16(), W_OK) == 0)
data.entryFlags |= QFileSystemMetaData::UserWritePermission;
- data.knownFlagsMask |= QFileSystemMetaData::UserReadPermission;
+ data.knownFlagsMask |= QFileSystemMetaData::UserWritePermission;
}
}