Use a qbs-specific group for the settings.

Otherwise, non-qbs settings from fallback locations will add noise for
users. This patch is in effect an addendum to commit 065d89fa2c, which
assumed that this happened only on OSX. However, we have now seen such
problems also on Linux.

Change-Id: If4e40d5941c8e1bd249cf75096b59d4b10880d00
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/src/lib/tools/settings.cpp b/src/lib/tools/settings.cpp
index 95d27ba24..f170930eb 100644
--- a/src/lib/tools/settings.cpp
+++ b/src/lib/tools/settings.cpp
@@ -68,18 +68,16 @@ static void migrateGroup(QSettings *settings, const QString &group)
 Settings::Settings(const QString &organization, const QString &application)
     : m_settings(new QSettings(format(), QSettings::UserScope, organization, application))
 {
-    if (HostOsInfo::isOsxHost()) {
-        // Migrate settings to internal group.
-        // ### remove in qbs 1.3
-        if (!m_settings->childGroups().contains(QLatin1String("org/qt-project/qbs"))) {
-            migrateValue(m_settings, QLatin1String("defaultProfile"));
-            migrateGroup(m_settings, QLatin1String("profiles"));
-            migrateGroup(m_settings, QLatin1String("preferences"));
-        }
-        // Actual qbs settings are stored within a group, because QSettings sees extra system global
-        // settings on OS X we're not interested in.
-        m_settings->beginGroup(QLatin1String("org/qt-project/qbs"));
+    // Migrate settings to internal group.
+    // ### remove in qbs 1.3
+    if (!m_settings->childGroups().contains(QLatin1String("org/qt-project/qbs"))) {
+        migrateValue(m_settings, QLatin1String("defaultProfile"));
+        migrateGroup(m_settings, QLatin1String("profiles"));
+        migrateGroup(m_settings, QLatin1String("preferences"));
     }
+    // Actual qbs settings are stored transparently within a group, because QSettings
+    // can see non-qbs fallback settings e.g. from QtProject that we're not interested in.
+    m_settings->beginGroup(QLatin1String("org/qt-project/qbs"));
 }
 
 Settings::~Settings()