Do not uninstall needed virtual dependencies

Virtual dependencies are uninstalled if all dependencies to the
component is removed. Virtual dependencies were calculated using recent
components in repository, which is wrong as the dependencies may have
changed in the repository, causing the dependencies to be uninstalled
although those are still needed. Fixed so that the uninstallable virtual
components are calculated from repository components if the component is
going to be updated, otherwise the dependeny is calculated from the
local installed packages.

Task-number: QTIFW-2573
Change-Id: If9cc59fa7f453d502ec1883f27273ef604128a6e
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/libs/installer/uninstallercalculator.cpp b/src/libs/installer/uninstallercalculator.cpp
index fc5620936..7d5ce9e2a 100644
--- a/src/libs/installer/uninstallercalculator.cpp
+++ b/src/libs/installer/uninstallercalculator.cpp
@@ -127,10 +127,10 @@ void UninstallerCalculator::appendComponentsToUninstall(const QList<Component*>
     if (!autoDependOnList.isEmpty())
         appendComponentsToUninstall(autoDependOnList);
     else
-        continueAppendComponentsToUninstall();
+        appendVirtualComponentsToUninstall();
 }
 
-void UninstallerCalculator::continueAppendComponentsToUninstall()
+void UninstallerCalculator::appendVirtualComponentsToUninstall()
 {
     QList<Component*> unneededVirtualList;
     // Check for virtual components without dependees
@@ -141,8 +141,9 @@ void UninstallerCalculator::continueAppendComponentsToUninstall()
                 continue;
 
             bool required = false;
-            for (Component *dependee : m_core->dependees(component)) {
-                if (dependee->isInstalled() && !m_componentsToUninstall.contains(dependee)) {
+            // Check if installed or about to be updated -packages are dependant on the package
+            for (Component *dependant : m_core->installDependants(component)) {
+                if (dependant->isInstalled() && !m_componentsToUninstall.contains(dependant)) {
                     required = true;
                     break;
                 }