1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded

Browse Source 
use QFile::decodeName() instead

Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

(cherry picked from commit 38b4b059e83bca2fe82a0826bdf69fd8b02b2827)

Change-Id: I8133885f7b53842d7230eeb80cf2e39a244a87d7
Reviewed-on: http://codereview.qt-project.org/4589
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Konstantin Ritt 2011-09-07 19:51:24 +02:00 committed by Qt by Nokia
parent 946725afff
commit 289ed56cc9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qsettings.cpp
View File

@ -1108,11 +1108,11 @@ static void initDefaultPaths(QMutexLocker *locker)
userPath += QLatin1String(".config"); userPath += QLatin1String(".config");
#endif #endif
} else if (*env == '/') { } else if (*env == '/') {
userPath = QLatin1String(env); userPath = QFile::decodeName(env);
} else { } else {
userPath = homePath; userPath = homePath;
userPath += QLatin1Char('/'); userPath += QLatin1Char('/');
userPath += QLatin1String(env); userPath += QFile::decodeName(env);
} }
userPath += QLatin1Char('/'); userPath += QLatin1Char('/');