Fix replaced component uninstall4.3

Replaced component was uninstalled when installing other components
although no update or install was requested to the component. Fixes also
a bug when some components were uninstalled unvisible from user.

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

3 files changed, 47 insertions, 30 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index f0b923024..918b01ad6 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -570,7 +570,7 @@ void PackageManagerCore::cancelMetaInfoJob()
 void PackageManagerCore::componentsToInstallNeedsRecalculation()
 {
     d->clearInstallerCalculator();
-    d->clearUninstallerCalculator();
+
     QList<Component*> selectedComponentsToInstall = componentsMarkedForInstallation();
 
     d->m_componentsToInstallCalculated =
@@ -578,13 +578,7 @@ void PackageManagerCore::componentsToInstallNeedsRecalculation()
 
     QList<Component *> componentsToInstall = d->installerCalculator()->orderedComponentsToInstall();
 
-    QList<Component *> selectedComponentsToUninstall;
-    foreach (Component *component, components(ComponentType::All)) {
-        if (component->uninstallationRequested() && !selectedComponentsToInstall.contains(component))
-            selectedComponentsToUninstall.append(component);
-    }
-
-    d->uninstallerCalculator()->appendComponentsToUninstall(selectedComponentsToUninstall);
+    d->calculateUninstallComponents();
 
     QSet<Component *> componentsToUninstall = d->uninstallerCalculator()->componentsToUninstall();
 
@@ -2165,20 +2159,8 @@ bool PackageManagerCore::calculateComponentsToUninstall() const
 {
     emit aboutCalculateComponentsToUninstall();
     if (!isUpdater()) {
-        // hack to avoid removing needed dependencies
-        const QList<Component *> componentsToInstallList
-            = d->installerCalculator()->orderedComponentsToInstall();
-        QSet<Component*> componentsToInstall(componentsToInstallList.begin(), componentsToInstallList.end());
-
-        QList<Component*> componentsToUninstall;
-        foreach (Component *component, components(ComponentType::All)) {
-            if (component->uninstallationRequested() && !componentsToInstall.contains(component))
-                componentsToUninstall.append(component);
-        }
-
-        d->clearUninstallerCalculator();
+        d->calculateUninstallComponents();
         d->storeCheckState();
-        d->uninstallerCalculator()->appendComponentsToUninstall(componentsToUninstall);
     }
     emit finishedCalculateComponentsToUninstall();
     return true;
@@ -3873,7 +3855,7 @@ void PackageManagerCore::storeReplacedComponents(QHash<QString, Component *> &co
                 key = treeNameComponents->value(componentName);
                 treeNameComponents->remove(componentName);
             }
-            Component *componentToReplace = components.take(key);
+            Component *componentToReplace = components.value(key);
             if (!componentToReplace) {
                 // If a component replaces another component which is not existing in the
                 // installer binary or the installed component list, just ignore it. This
@@ -3882,8 +3864,21 @@ void PackageManagerCore::storeReplacedComponents(QHash<QString, Component *> &co
                     qCWarning(QInstaller::lcDeveloperBuild) << componentName << "- Does not exist in the repositories anymore.";
                 continue;
             }
-            d->replacementDependencyComponents().append(componentToReplace);
+            // Remove the replaced component from instal tree if
+            // 1. Running installer (component is replaced by other component)
+            // 2. Replacement is already installed but replacable is not
+            // Do not remove the replaced component from install tree
+            // in updater so that would show as an update
+            // Also do not remove the replaced component from install tree
+            // if it is already installed together with replacable component,
+            // otherwise it does not match what we have defined in components.xml
+            if (!isUpdater()
+                    && (isInstaller() || (it.key() && it.key()->isInstalled() && !componentToReplace->isInstalled()))) {
+                components.remove(key);
+                d->m_deletedReplacedComponents.append(componentToReplace);
+            }
             d->componentsToReplace().insert(componentName, qMakePair(it.key(), componentToReplace));
+            d->replacementDependencyComponents().append(componentToReplace);
         }
     }
 }
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 154f2f638..4aaa27cfd 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -514,14 +514,11 @@ void PackageManagerCorePrivate::clearAllComponentLists()
 {
     QList<QInstaller::Component*> toDelete;
 
-    toDelete << m_rootComponents;
+    toDelete << m_rootComponents << m_deletedReplacedComponents;
     m_rootComponents.clear();
-
     m_rootDependencyReplacements.clear();
+    m_deletedReplacedComponents.clear();
 
-    const QList<QPair<Component*, Component*> > list = m_componentsToReplaceAllMode.values();
-    for (int i = 0; i < list.count(); ++i)
-        toDelete << list.at(i).second;
     m_componentsToReplaceAllMode.clear();
     m_componentsToInstallCalculated = false;
 
@@ -2783,6 +2780,29 @@ bool PackageManagerCorePrivate::calculateComponentsAndRun()
     return false;
 }
 
+void PackageManagerCorePrivate::calculateUninstallComponents()
+{
+    clearUninstallerCalculator();
+    const QList<Component *> componentsToInstallList = installerCalculator()->orderedComponentsToInstall();
+    QSet<Component*> componentsToInstall(componentsToInstallList.begin(), componentsToInstallList.end());
+
+    QList<Component *> selectedComponentsToUninstall;
+    foreach (Component* component, m_core->components(PackageManagerCore::ComponentType::Replacements)) {
+        // Uninstall the component if replacement is selected for install or update
+        QPair<Component*, Component*> comp = componentsToReplace().value(component->name());
+        if (comp.first) {
+            if (comp.first->isSelectedForInstallation() || comp.first->updateRequested()) {
+                selectedComponentsToUninstall.append(comp.second);
+            }
+        }
+    }
+    foreach (Component *component, m_core->components(PackageManagerCore::ComponentType::AllNoReplacements)) {
+        if (component->uninstallationRequested() && !componentsToInstallList.contains(component))
+            selectedComponentsToUninstall.append(component);
+    }
+    uninstallerCalculator()->appendComponentsToUninstall(selectedComponentsToUninstall);
+}
+
 bool PackageManagerCorePrivate::acceptLicenseAgreements() const
 {
     // Always skip for uninstaller
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 73c378f43..d17a752f9 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -250,6 +250,7 @@ private:
     void findExecutablesRecursive(const QString &path, const QStringList &excludeFiles, QStringList *result);
     QStringList runningInstallerProcesses(const QStringList &exludeFiles);
     bool calculateComponentsAndRun();
+    void calculateUninstallComponents();
     bool acceptLicenseAgreements() const;
     bool askUserAcceptLicense(const QString &name, const QString &content) const;
     bool askUserConfirmCommand() const;
@@ -294,6 +295,7 @@ private:
     void restoreCheckState();
     void storeCheckState();
     QHash<Component*, Qt::CheckState> m_coreCheckedHash;
+    QList<Component*> m_deletedReplacedComponents;
 };
 
 } // namespace QInstaller