From 6c38a975eeb0ebe06e7146fed6cf4bcdf8499b6c Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Tue, 19 Jun 2018 13:52:24 +0300 Subject: Add property to disable default repository saving By default, all default repositories defined in are saved to maintenancetool.ini -file. When you start maintenancetool, the repositories are read from maintenancetool.ini and those are used. There are cases when we don't want to use the default repositories when running maintenancetol. Change-Id: I4507e16636f2d709aa099eaa865264800591ce0d Reviewed-by: Leena Miettinen Reviewed-by: Jani Heikkinen --- src/libs/installer/settings.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/libs/installer/settings.cpp') diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 3d5d4b858..5761387c6 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -256,7 +256,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, << scWizardDefaultWidth << scWizardDefaultHeight << scRepositorySettingsPageVisible << scTargetConfigurationFile << scRemoteRepositories << scTranslations << scUrlQueryString << QLatin1String(scControlScript) - << scCreateLocalRepository << scInstallActionColumnVisible << scSupportsModify << scAllowUnstableComponents; + << scCreateLocalRepository << scInstallActionColumnVisible << scSupportsModify << scAllowUnstableComponents + << scSaveDefaultRepositories; Settings s; s.d->m_data.insert(scPrefix, prefix); @@ -327,6 +328,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, s.d->m_data.insert(scInstallActionColumnVisible, false); if (!s.d->m_data.contains(scAllowUnstableComponents)) s.d->m_data.insert(scAllowUnstableComponents, false); + if (!s.d->m_data.contains(scSaveDefaultRepositories)) + s.d->m_data.insert(scSaveDefaultRepositories, true); return s; } @@ -754,3 +757,13 @@ void Settings::setAllowUnstableComponents(bool allow) { d->m_data.insert(scAllowUnstableComponents, allow); } + +bool Settings::saveDefaultRepositories() const +{ + return d->m_data.value(scSaveDefaultRepositories, true).toBool(); +} + +void Settings::setSaveDefaultRepositories(bool save) +{ + d->m_data.insert(scSaveDefaultRepositories, save); +} -- cgit v1.2.3