summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/settings.cpp
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-02-28 09:54:22 +0200
committerKatja Marttila <katja.marttila@qt.io>2018-04-05 06:54:21 +0000
commitd2ae9c16c3427c272d41e9a471f705ad8947a97a (patch)
tree4ed6b3cafd28b11f02ef4f4faa6164bcfbd85b63 /src/libs/installer/settings.cpp
parent6664ca85f09d6ae195ac30f83a60d53c2355da0f (diff)
Add attribute to mark parts of install tree unstable
This commit adds new AllowUnstableComponents configuration. Setting AllowUnstablecomponents to true in config.xml will * allow installing other components when there are errors in scripts * allow installing other components when there are missing dependencies * will mark the 'broken' components uninstallable in treeview Task-number: QTIFW-930 Change-Id: I8d28cf9c4b0401e0bb76795e87d581f39b64f128 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer/settings.cpp')
-rw-r--r--src/libs/installer/settings.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 79d4bcddc..3d5d4b858 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -256,7 +256,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
<< scWizardDefaultWidth << scWizardDefaultHeight
<< scRepositorySettingsPageVisible << scTargetConfigurationFile
<< scRemoteRepositories << scTranslations << scUrlQueryString << QLatin1String(scControlScript)
- << scCreateLocalRepository << scInstallActionColumnVisible << scSupportsModify;
+ << scCreateLocalRepository << scInstallActionColumnVisible << scSupportsModify << scAllowUnstableComponents;
Settings s;
s.d->m_data.insert(scPrefix, prefix);
@@ -325,7 +325,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
s.d->m_data.insert(scCreateLocalRepository, false);
if (!s.d->m_data.contains(scInstallActionColumnVisible))
s.d->m_data.insert(scInstallActionColumnVisible, false);
-
+ if (!s.d->m_data.contains(scAllowUnstableComponents))
+ s.d->m_data.insert(scAllowUnstableComponents, false);
return s;
}
@@ -743,3 +744,13 @@ bool Settings::supportsModify() const
{
return d->m_data.value(scSupportsModify, true).toBool();
}
+
+bool Settings::allowUnstableComponents() const
+{
+ return d->m_data.value(scAllowUnstableComponents, true).toBool();
+}
+
+void Settings::setAllowUnstableComponents(bool allow)
+{
+ d->m_data.insert(scAllowUnstableComponents, allow);
+}