OSDN Git Service

Revert "Extend QSettings workaround to Windows."
authorRobert Loehning <robert.loehning@nokia.com>
Tue, 22 Jun 2010 12:07:32 +0000 (14:07 +0200)
committerRobert Loehning <robert.loehning@nokia.com>
Tue, 22 Jun 2010 13:08:48 +0000 (15:08 +0200)
Workaround is no longer needed and causes trouble with cyrillic characters.

This reverts commit 56aac18bd804bab35e344ea9e896815766e1f45c.

src/app/main.cpp

index efbbd31..14e0c96 100644 (file)
@@ -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"));