Fix that aspects read&wrote install settings

Do not give them the QSettings object that has SystemScope.
Also rename the "globalSettings" term to "installSettings" locally and
in PluginManager, and the one for aspects to just "setSettings" (like
e.g. for TerminalCommand).

Change-Id: Iad051f6e507373042014db73b83d0b16944b7374
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 540b512561..f92930d0aa 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -619,7 +619,7 @@ int main(int argc, char **argv)
     // Re-setup install settings for real
     setupInstallSettings(options.installSettingsPath);
     Utils::QtcSettings *settings = createUserSettings();
-    Utils::QtcSettings *globalSettings
+    Utils::QtcSettings *installSettings
         = new Utils::QtcSettings(QSettings::IniFormat,
                                  QSettings::SystemScope,
                                  QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR),
@@ -652,10 +652,10 @@ int main(int argc, char **argv)
 
     PluginManager pluginManager;
     PluginManager::setPluginIID(QLatin1String("org.qt-project.Qt.QtCreatorPlugin"));
-    PluginManager::setGlobalSettings(globalSettings);
+    PluginManager::setInstallSettings(installSettings);
     PluginManager::setSettings(settings);
 
-    Utils::BaseAspect::setGlobalSettings(globalSettings);
+    Utils::BaseAspect::setSettings(settings);
 
     using namespace Core;
     Utils::AppInfo info;