diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-09-07 17:51:24 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-09-07 17:51:24 (GMT) |
| commit | 38b4b059e83bca2fe82a0826bdf69fd8b02b2827 (patch) | |
| tree | 43db6df74df71bd03323377399be40249fbb0a28 /src/corelib | |
| parent | 4aff9e52efc7c6fc6124972efb3b381f85c45e4f (diff) | |
| download | Qt-38b4b059e83bca2fe82a0826bdf69fd8b02b2827.zip Qt-38b4b059e83bca2fe82a0826bdf69fd8b02b2827.tar.gz Qt-38b4b059e83bca2fe82a0826bdf69fd8b02b2827.tar.bz2 | |
QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
use QFile::decodeName() instead
Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 9f9802c..547bbeb 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1108,11 +1108,11 @@ static void initDefaultPaths(QMutexLocker *locker) userPath += QLatin1String(".config"); #endif } else if (*env == '/') { - userPath = QLatin1String(env); + userPath = QFile::decodeName(env); } else { userPath = homePath; userPath += QLatin1Char('/'); - userPath += QLatin1String(env); + userPath += QFile::decodeName(env); } userPath += QLatin1Char('/'); |