summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/examples/aliases.xml10
-rw-r--r--doc/installerfw.qdoc8
-rw-r--r--src/libs/installer/componentalias.cpp16
-rw-r--r--src/libs/installer/constants.h8
-rw-r--r--src/libs/installer/loggingutils.cpp8
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp4
-rw-r--r--tests/auto/installer/componentalias/data/aliases-optional.xml10
-rw-r--r--tests/auto/installer/componentalias/data/aliases-priority.xml10
-rw-r--r--tests/auto/installer/componentalias/data/aliases-versions.xml10
-rw-r--r--tests/auto/installer/componentalias/metadata/installer-config/aliases.xml14
10 files changed, 49 insertions, 49 deletions
diff --git a/doc/examples/aliases.xml b/doc/examples/aliases.xml
index 4f9bc3898..1ce962f1e 100644
--- a/doc/examples/aliases.xml
+++ b/doc/examples/aliases.xml
@@ -6,9 +6,9 @@
<Description>Complete installation of the product</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>package-essential</RequiresAlias>
- <RequiresComponent>com.vendor.root.extras</RequiresComponent>
- <OptionalAlias>package-optional</OptionalAlias>
+ <RequiredAliases>package-essential</RequiredAliases>
+ <RequiredComponents>com.vendor.root.extras</RequiredComponents>
+ <OptionalAliases>package-optional</OptionalAliases>
</Alias>
<Alias>
<Name>package-essential</Name>
@@ -16,7 +16,7 @@
<Description>Essential components for the product</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>com.vendor.root.essential</RequiresComponent>
+ <RequiredComponents>com.vendor.root.essential</RequiredComponents>
</Alias>
<Alias>
<Name>package-optional</Name>
@@ -24,7 +24,7 @@
<Description>Optional components for the product</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <OptionalComponent>com.vendor.root.optional1,com.vendor.root.optional2</OptionalComponent>
+ <OptionalComponents>com.vendor.root.optional1,com.vendor.root.optional2</OptionalComponents>
</Alias>
</Aliases>
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 71a824bbc..04839a196 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -671,25 +671,25 @@
\li Set to \c true to hide the component alias from the installer. This also
makes the alias unselectable by the user.
\row
- \li RequiresComponent
+ \li RequiredComponents
\li Comma-separated list of identifiers of components that this
component alias requires. The components are selected for installation
when the component alias is selected. Note that the components must be
selectable by the user, so virtual or otherwise unselectable components
cannot be listed as a requirement.
\row
- \li RequiresAlias
+ \li RequiredAliases
\li Comma-separated list of aliases that this component alias requires. The
required aliases are selected for installation when this component alias
is selected.
\row
- \li OptionalComponent
+ \li OptionalComponents
\li Comma-separated list of identifiers of components that this component alias
optionally depends on. The components are selected for installation when the
component alias is selected, if the components exists and are user selectable.
Even if the components cannot be found in the installer, this alias is not marked unstable.
\row
- \li OptionalAlias
+ \li OptionalAliases
\li Comma-separated list of aliases that this component alias optionally depends on. The
listed aliases are selected for installation when this component alias is selected,
if the aliases exist. Even if the aliases don't exists in the installer,
diff --git a/src/libs/installer/componentalias.cpp b/src/libs/installer/componentalias.cpp
index 87ead7e1f..85797ca33 100644
--- a/src/libs/installer/componentalias.cpp
+++ b/src/libs/installer/componentalias.cpp
@@ -245,10 +245,10 @@ bool AliasFinder::parseXml(AliasSource source)
&& tag2 != scDescription
&& tag2 != scVersion
&& tag2 != scVirtual
- && tag2 != scRequiresComponent
- && tag2 != scRequiresAlias
- && tag2 != scOptionalComponent
- && tag2 != scOptionalAlias) {
+ && tag2 != scRequiredComponents
+ && tag2 != scRequiredAliases
+ && tag2 != scOptionalComponents
+ && tag2 != scOptionalAliases) {
qCWarning(lcInstallerInstallLog) << "Unexpected element name:" << tag2;
continue;
}
@@ -424,10 +424,10 @@ QList<Component *> ComponentAlias::components()
{
if (m_components.isEmpty()) {
const QStringList componentList = QInstaller::splitStringWithComma(
- m_variables.value(scRequiresComponent));
+ m_variables.value(scRequiredComponents));
const QStringList optionalComponentList = QInstaller::splitStringWithComma(
- m_variables.value(scOptionalComponent));
+ m_variables.value(scOptionalComponents));
addRequiredComponents(componentList, false);
addRequiredComponents(optionalComponentList, true);
@@ -444,10 +444,10 @@ QList<ComponentAlias *> ComponentAlias::aliases()
{
if (m_aliases.isEmpty()) {
const QStringList aliasList = QInstaller::splitStringWithComma(
- m_variables.value(scRequiresAlias));
+ m_variables.value(scRequiredAliases));
const QStringList optionalAliasList = QInstaller::splitStringWithComma(
- m_variables.value(scOptionalAlias));
+ m_variables.value(scOptionalAliases));
addRequiredAliases(aliasList, false);
addRequiredAliases(optionalAliasList, true);
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 6afd732a0..e69d1bd4d 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -61,10 +61,10 @@ static const QLatin1String scTreeName("TreeName");
static const QLatin1String scAutoTreeName("AutoTreeName");
static const QLatin1String scDependencies("Dependencies");
static const QLatin1String scAlias("Alias");
-static const QLatin1String scRequiresAlias("RequiresAlias");
-static const QLatin1String scRequiresComponent("RequiresComponent");
-static const QLatin1String scOptionalAlias("OptionalAlias");
-static const QLatin1String scOptionalComponent("OptionalComponent");
+static const QLatin1String scRequiredAliases("RequiredAliases");
+static const QLatin1String scRequiredComponents("RequiredComponents");
+static const QLatin1String scOptionalAliases("OptionalAliases");
+static const QLatin1String scOptionalComponents("OptionalComponents");
static const QLatin1String scLocalDependencies("LocalDependencies");
static const QLatin1String scAutoDependOn("AutoDependOn");
static const QLatin1String scNewComponent("NewComponent");
diff --git a/src/libs/installer/loggingutils.cpp b/src/libs/installer/loggingutils.cpp
index a9c96e0c9..9a36720dd 100644
--- a/src/libs/installer/loggingutils.cpp
+++ b/src/libs/installer/loggingutils.cpp
@@ -392,11 +392,11 @@ void LoggingHandler::printAliasInformation(const QList<ComponentAlias *> &aliase
if (verboseLevel() == VerbosityLevel::Detailed)
stream << "Virtual: " << alias->value(scVirtual) << Qt::endl;
- stream << "Components: " << alias->value(scRequiresComponent) << Qt::endl;
- stream << "Required aliases: " << alias->value(scRequiresAlias) << Qt::endl;
+ stream << "Components: " << alias->value(scRequiredComponents) << Qt::endl;
+ stream << "Required aliases: " << alias->value(scRequiredAliases) << Qt::endl;
- stream << "Optional components: " << alias->value(scOptionalComponent) << Qt::endl;
- stream << "Optional aliases: " << alias->value(scOptionalAlias) << Qt::endl;
+ stream << "Optional components: " << alias->value(scOptionalComponents) << Qt::endl;
+ stream << "Optional aliases: " << alias->value(scOptionalAliases) << Qt::endl;
if (sortedAliases.indexOf(alias) != (sortedAliases.count() - 1))
stream << "========================================" << Qt::endl;
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 2590564a7..fd2e9abd4 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -461,8 +461,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(scOptionalAlias)));
+ QInstaller::splitStringWithComma(alias->value(scRequiredAliases)) <<
+ QInstaller::splitStringWithComma(alias->value(scOptionalAliases)));
if (!m_core->componentByName(alias->name())) {
// Name ok, select for sanity check calculation
diff --git a/tests/auto/installer/componentalias/data/aliases-optional.xml b/tests/auto/installer/componentalias/data/aliases-optional.xml
index 4870c43ed..bc16013b7 100644
--- a/tests/auto/installer/componentalias/data/aliases-optional.xml
+++ b/tests/auto/installer/componentalias/data/aliases-optional.xml
@@ -6,8 +6,8 @@
<Description>Installs component A</Description>
<Version>2.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>A</RequiresComponent>
- <OptionalComponent>component-nonexistent,B</OptionalComponent>
+ <RequiredComponents>A</RequiredComponents>
+ <OptionalComponents>component-nonexistent,B</OptionalComponents>
</Alias>
<Alias>
<Name>set-full</Name>
@@ -15,7 +15,7 @@
<Description>Installs all components</Description>
<Version>2.0.0</Version>
<Virtual>false</Virtual>
- <OptionalAlias>set-A,set-nonexistent</OptionalAlias>
+ <OptionalAliases>set-A,set-nonexistent</OptionalAliases>
</Alias>
<Alias>
<Name>set-optional-broken</Name>
@@ -23,7 +23,7 @@
<Description>Optionally requires broken alias</Description>
<Version>2.0.0</Version>
<Virtual>false</Virtual>
- <OptionalAlias>set-broken</OptionalAlias>
+ <OptionalAliases>set-broken</OptionalAliases>
</Alias>
<Alias>
<Name>set-broken</Name>
@@ -31,6 +31,6 @@
<Description>Requires non-existent alias</Description>
<Version>2.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>set-nonexistent</RequiresAlias>
+ <RequiredAliases>set-nonexistent</RequiredAliases>
</Alias>
</Aliases>
diff --git a/tests/auto/installer/componentalias/data/aliases-priority.xml b/tests/auto/installer/componentalias/data/aliases-priority.xml
index 192ff9e44..f90d006b2 100644
--- a/tests/auto/installer/componentalias/data/aliases-priority.xml
+++ b/tests/auto/installer/componentalias/data/aliases-priority.xml
@@ -6,7 +6,7 @@
<Description>Installs component A</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>A</RequiresComponent>
+ <RequiredComponents>A</RequiredComponents>
</Alias>
<Alias>
<Name>set-B</Name>
@@ -14,7 +14,7 @@
<Description>Installs component B</Description>
<Version>1.0.0</Version>
<Virtual>true</Virtual>
- <RequiresComponent>B</RequiresComponent>
+ <RequiredComponents>B</RequiredComponents>
</Alias>
<Alias>
<Name>set-D</Name>
@@ -22,7 +22,7 @@
<Description>Installs missing component D</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>D</RequiresComponent>
+ <RequiredComponents>D</RequiredComponents>
</Alias>
<Alias>
<Name>set-full</Name>
@@ -30,7 +30,7 @@
<Description>Installs all components</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>set-A,set-B</RequiresAlias>
- <RequiresComponent>C</RequiresComponent>
+ <RequiredAliases>set-A,set-B</RequiredAliases>
+ <RequiredComponents>C</RequiredComponents>
</Alias>
</Aliases>
diff --git a/tests/auto/installer/componentalias/data/aliases-versions.xml b/tests/auto/installer/componentalias/data/aliases-versions.xml
index d460f3275..993e14673 100644
--- a/tests/auto/installer/componentalias/data/aliases-versions.xml
+++ b/tests/auto/installer/componentalias/data/aliases-versions.xml
@@ -6,7 +6,7 @@
<Description>Installs component A</Description>
<Version>2.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>A</RequiresComponent>
+ <RequiredComponents>A</RequiredComponents>
</Alias>
<Alias>
<Name>set-B</Name>
@@ -14,7 +14,7 @@
<Description>Installs component B</Description>
<Version>1.1.0</Version>
<Virtual>true</Virtual>
- <RequiresComponent>B</RequiresComponent>
+ <RequiredComponents>B</RequiredComponents>
</Alias>
<Alias>
<Name>set-D</Name>
@@ -22,7 +22,7 @@
<Description>Installs missing component D</Description>
<Version>1.2.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>D</RequiresComponent>
+ <RequiredComponents>D</RequiredComponents>
</Alias>
<Alias>
<Name>set-full</Name>
@@ -30,7 +30,7 @@
<Description>Installs all components</Description>
<Version>3.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>set-A,set-B</RequiresAlias>
- <RequiresComponent>C</RequiresComponent>
+ <RequiredAliases>set-A,set-B</RequiredAliases>
+ <RequiredComponents>C</RequiredComponents>
</Alias>
</Aliases>
diff --git a/tests/auto/installer/componentalias/metadata/installer-config/aliases.xml b/tests/auto/installer/componentalias/metadata/installer-config/aliases.xml
index e55dcc3ba..278ae918b 100644
--- a/tests/auto/installer/componentalias/metadata/installer-config/aliases.xml
+++ b/tests/auto/installer/componentalias/metadata/installer-config/aliases.xml
@@ -6,7 +6,7 @@
<Description>Installs component A</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>A</RequiresComponent>
+ <RequiredComponents>A</RequiredComponents>
</Alias>
<Alias>
<Name>set-B</Name>
@@ -14,7 +14,7 @@
<Description>Installs component B</Description>
<Version>1.0.0</Version>
<Virtual>true</Virtual>
- <RequiresComponent>B</RequiresComponent>
+ <RequiredComponents>B</RequiredComponents>
</Alias>
<Alias>
<Name>set-D</Name>
@@ -22,7 +22,7 @@
<Description>Installs missing component D</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresComponent>D</RequiresComponent>
+ <RequiredComponents>D</RequiredComponents>
</Alias>
<Alias>
<Name>set-E</Name>
@@ -30,7 +30,7 @@
<Description>Installs set E</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>set-D</RequiresAlias>
+ <RequiredAliases>set-D</RequiredAliases>
</Alias>
<Alias>
<Name>set-F</Name>
@@ -38,7 +38,7 @@
<Description>Installs set F</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>set-E</RequiresAlias>
+ <RequiredAliases>set-E</RequiredAliases>
</Alias>
<Alias>
<Name>set-full</Name>
@@ -46,7 +46,7 @@
<Description>Installs all components</Description>
<Version>1.0.0</Version>
<Virtual>false</Virtual>
- <RequiresAlias>set-A,set-B</RequiresAlias>
- <RequiresComponent>C</RequiresComponent>
+ <RequiredAliases>set-A,set-B</RequiredAliases>
+ <RequiredComponents>C</RequiredComponents>
</Alias>
</Aliases>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 08:26:36 +0000