feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix that aspects read&wrote install settings

Browse Source 
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>
This commit is contained in:
Eike Ziller
2023-07-18 09:51:50 +02:00
parent ef04ff2189
commit d127336753
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/main.cpp
View File

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

2
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -488,7 +488,7 @@ void PluginManager::setSettings(QtcSettings *settings)
default disabled plugins. default disabled plugins.
Needs to be set before the plugin search path is set with setPluginPaths(). Needs to be set before the plugin search path is set with setPluginPaths().
*/ */
void PluginManager::setGlobalSettings(QtcSettings *settings) void PluginManager::setInstallSettings(QtcSettings *settings)
{ {
d->setGlobalSettings(settings); d->setGlobalSettings(settings);
} }

2
src/libs/extensionsystem/pluginmanager.h
View File

@@ -83,7 +83,7 @@ public:
// Settings // Settings
static void setSettings(Utils::QtcSettings *settings); static void setSettings(Utils::QtcSettings *settings);
static Utils::QtcSettings *settings(); static Utils::QtcSettings *settings();
static void setGlobalSettings(Utils::QtcSettings *settings); static void setInstallSettings(Utils::QtcSettings *settings);
static Utils::QtcSettings *globalSettings(); static Utils::QtcSettings *globalSettings();
static void writeSettings(); static void writeSettings();

2
src/libs/utils/aspects.cpp
View File

@@ -37,7 +37,7 @@ namespace Utils {
static QSettings *theSettings = nullptr; static QSettings *theSettings = nullptr;
void BaseAspect::setGlobalSettings(QSettings *settings) void BaseAspect::setSettings(QSettings *settings)
{ {
theSettings = settings; theSettings = settings;
} }

2
src/libs/utils/aspects.h
View File

@@ -161,7 +161,7 @@ public:
Data::Ptr extractData() const; Data::Ptr extractData() const;
static void setGlobalSettings(QSettings *settings); static void setSettings(QSettings *settings);
static QSettings *settings(); static QSettings *settings();
signals: signals: