diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-06-08 08:22:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-08 08:22:10 +0200 |
| commit | 623e607b2316ee0349763e681b3f744e2e376292 (patch) | |
| tree | e42fb7d43d7aa3a4133a14c3f34c8c9c1a9e04e0 /src/plugins/mcusupport | |
| parent | d62acfdefa3e07093742c50bada870f69b7ad1c3 (diff) | |
| parent | 63bb91f0b78f7ab2f969dee1ad488f2c1f9058f5 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I19a7406f7e387b53f1e7b3f08a0b4c89a377ab82
Diffstat (limited to 'src/plugins/mcusupport')
| -rw-r--r-- | src/plugins/mcusupport/mcusupportoptions.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index a15f63acbc1..4e09e42c447 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -167,12 +167,16 @@ bool McuPackage::addToPath() const void McuPackage::writeToSettings() const { - if (m_path.compare(m_defaultPath) == 0) - return; - QSettings *s = Core::ICore::settings(); - s->beginGroup(Constants::SETTINGS_GROUP); - s->setValue(QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey, m_path); - s->endGroup(); + const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/' + + QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey; + const QSettings *iS = Core::ICore::settings(QSettings::SystemScope); + QSettings *uS = Core::ICore::settings(); + if (m_path == m_defaultPath || ( + 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) |