Fix nested autodependency uninstall

Previous commit worked only when --show-virtual-components was uses.

Task-number: QTIFW-1114 QTBUG-67106
Change-Id: I6d0649a37095b10ec9fd3a079e020f6a70345c94
Reviewed-by: Antti Kokko <antti.kokko@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/libs/installer/uninstallercalculator.cpp b/src/libs/installer/uninstallercalculator.cpp
index 5d49d37dc..597c7902f 100644
--- a/src/libs/installer/uninstallercalculator.cpp
+++ b/src/libs/installer/uninstallercalculator.cpp
@@ -103,16 +103,17 @@ void UninstallerCalculator::appendComponentsToUninstall(const QList<Component*>
 
                     Component *cc = PackageManagerCore::componentByName(possibleName, m_installedComponents);
                     if (!cc->uninstallationRequested()) {
-                        autoDependencies.removeAll(possibleName);
+                        if (cc->installAction() != ComponentModelHelper::AutodependUninstallation) {
+                            autoDependencies.removeAll(possibleName);
+                        }
                     }
                 }
             }
 
-            // A component requested auto installation, keep it to resolve their dependencies as well.
-            // Mark it unchecked for their dependencies to know that the component is marked for uninstallation.
+            // A component requested auto uninstallation, keep it to resolve their dependencies as well.
             if (!autoDependencies.isEmpty()) {
                 autoDependOnList.append(component);
-                component->setCheckState(Qt::Unchecked);
+                component->setInstallAction(ComponentModelHelper::AutodependUninstallation);
             }
         }
     }