summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore_p.cpp
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2023-09-25 15:46:33 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2023-09-29 09:33:57 +0300
commit170d9b46b4f3ff3d1bdf9a1c2550c2c34ff9b591 (patch)
tree32c32d604ea7a6e7df2bab49bf0880cdf0c6d6e9 /src/libs/installer/packagemanagercore_p.cpp
parentb91a864a051cf15e8839a22e5c4368c509f8914a (diff)
Add support for optional alias dependencies
In addition to RequiresComponent and RequiresAlias, introduce new OptionalComponent and OptionalAlias properties for component aliases. The new properties are used to declare optional requirements for aliases, which do not cause the declaring alias to become unstable in case the referred component or alias is missing from the installer. Task-number: QTIFW-3166 Change-Id: I43c8cd08099e879180ec7e028b55836750c727bd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index b4eab7712..16e0b815a 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -460,7 +460,8 @@ bool PackageManagerCorePrivate::buildComponentAliases()
for (auto *alias : qAsConst(m_componentAliases)) {
aliasGraph.addNode(alias->name());
aliasGraph.addEdges(alias->name(),
- QInstaller::splitStringWithComma(alias->value(scRequiresAlias)));
+ QInstaller::splitStringWithComma(alias->value(scRequiresAlias)) <<
+ QInstaller::splitStringWithComma(alias->value(scOptionalAlias)));
if (!m_core->componentByName(alias->name())) {
// Name ok, select for sanity check calculation