summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore_p.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 9fc81513c..011a79500 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -493,15 +493,6 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component
return true;
}
- QList<Component*> relevantComponentForAutoDependOn;
- if (isUpdater())
- relevantComponentForAutoDependOn = m_updaterComponents + m_updaterComponentsDeps;
- else {
- relevantComponentForAutoDependOn = m_rootComponents;
- foreach (QInstaller::Component *component, m_rootComponents)
- relevantComponentForAutoDependOn += component->childComponents(Component::Descendants);
- }
-
QList<Component*> notAppendedComponents; // for example components with unresolved dependencies
foreach (Component *component, components){
if (m_toInstallComponentIds.contains(component->name())) {
@@ -525,6 +516,10 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component
return false;
}
+ const QList<Component*> relevantComponentForAutoDependOn = isUpdater()
+ ? m_updaterComponents + m_updaterComponentsDeps
+ : m_core->rootAndChildComponents();
+
QList<Component *> foundAutoDependOnList;
// All regular dependencies are resolved. Now we are looking for auto depend on components.
foreach (Component *component, relevantComponentForAutoDependOn) {