From 289ed56cc9f0f87ac1279c323a29ef025239b513 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Wed, 7 Sep 2011 19:51:24 +0200
Subject: 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>

(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>
---
 src/corelib/io/qsettings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/io')

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index d4a9ceedf3..6d3fbfb592 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('/');
 
-- 
cgit v1.2.3