From 8ef646beeca0a7f28fe59028a0354d23bbb81bf4 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 22 Jun 2010 14:07:32 +0200 Subject: [PATCH] Revert "Extend QSettings workaround to Windows." Workaround is no longer needed and causes trouble with cyrillic characters. This reverts commit 56aac18bd804bab35e344ea9e896815766e1f45c. --- src/app/main.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index efbbd311deb..14e0c96226f 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -187,17 +187,11 @@ int main(int argc, char **argv) // Must be done before any QSettings class is created QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH)); - - // Work around bug in QSettings which gets triggered on Windows & Mac only #ifdef Q_OS_MAC + // Work around bug in QSettings QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QDir::homePath()+"/.config"); #endif -#ifdef Q_OS_WIN - QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, - qgetenv("appdata")); -#endif - // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp const QSettings settings(QSettings::IniFormat, QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtCreator"));