diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 00:09:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 00:09:23 (GMT) |
| commit | a7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba (patch) | |
| tree | 651ced89e2d4f1d568849ba2dbfa040f416bedea /src | |
| parent | c74dac2a0ef5d1b428c4da4e48fab05f9886233a (diff) | |
| parent | 3d402524355bbcc7a5fc9114834436879b7b19ac (diff) | |
| download | Qt-a7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba.zip Qt-a7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba.tar.gz Qt-a7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSettings: Fix isWritable incorrectly returning true on linux.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 64015ce..9562f58 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -252,9 +252,7 @@ bool QConfFile::isWritable() const } else { // Create the directories to the file. QDir dir(fileInfo.absolutePath()); - if (dir.exists() && dir.isReadable()) { - return true; - } else { + if (!dir.exists()) { if (!dir.mkpath(dir.absolutePath())) return false; } |