diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-06-17 17:06:45 +0000 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-06-20 07:59:25 +0000 |
| commit | b7857979037a55fc562d8e888afa1404279bac00 (patch) | |
| tree | 6c135bf75885bb5a3d44bd1287370290bafa7cdc /src/libs | |
| parent | 86b8f5f5a7e11e2121b5f1181c8a049b5562789a (diff) | |
Revert "Fix bug when installer is not installing all required components"
This reverts commit 86b8f5f5a7e11e2121b5f1181c8a049b5562789a.
Reason for revert: Wrong fix after all, we do check in realAppendToInstallComponents() whether the dependency component should be installed or not. This change messes the dependency reference count.
Change-Id: Ia7bed84b303f13449edb80e486cf192b8872febc
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/installercalculator.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/libs/installer/installercalculator.cpp b/src/libs/installer/installercalculator.cpp index 7528d7bd1..2ef5d3b74 100644 --- a/src/libs/installer/installercalculator.cpp +++ b/src/libs/installer/installercalculator.cpp @@ -239,12 +239,9 @@ bool InstallerCalculator::appendComponentToInstall(Component *component, const Q else m_referenceCount.insert(dependencyComponentName, value); } - if (!m_referenceCount.contains(dependencyComponentName)) { - insertInstallReason(dependencyComponent, InstallerCalculator::Dependent, - component->name(), true); - if (!appendComponentToInstall(dependencyComponent, requiredDependencyVersion, revertFromInstall)) - return false; - } + insertInstallReason(dependencyComponent, InstallerCalculator::Dependent, component->name(), true); + if (!appendComponentToInstall(dependencyComponent, requiredDependencyVersion, revertFromInstall)) + return false; m_visitedComponents.remove(component); } |