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

McuSupport: Fix a bug in the writing of settings

Browse Source 
The plugin wants to only store settings if they differ from the defaults
(e.g. a path was edited by the user).
The original attempt failed. If the user changed the path, stored it,
and then changed the path back to the default, the last change was not
stored.

Therefore, this change actually removes the settings entry if it equals
either the default or the install settings value.

Task-number: QTCREATORBUG-24048
Change-Id: I6ab11f276ae270bb8bbf50ad6d2bc7ea3dba2d7b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2020-06-03 09:28:47 +02:00
parent 777ae8b87b
commit 81e0d9da11
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -167,12 +167,16 @@ bool McuPackage::addToPath() const
void McuPackage::writeToSettings() const void McuPackage::writeToSettings() const
{ {
if (m_path.compare(m_defaultPath) == 0) const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/' +
return; QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey;
QSettings *s = Core::ICore::settings(); const QSettings *iS = Core::ICore::settings(QSettings::SystemScope);
s->beginGroup(Constants::SETTINGS_GROUP); QSettings *uS = Core::ICore::settings();
s->setValue(QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey, m_path); if (m_path == m_defaultPath || (
s->endGroup(); iS->contains(key) &&
m_path == Utils::FilePath::fromUserInput(iS->value(key).toString()).toString()))
uS->remove(key);
else
uS->setValue(key, m_path);
} }
void McuPackage::setRelativePathModifier(const QString &path) void McuPackage::setRelativePathModifier(const QString &path)