Merge remote-tracking branch 'origin/4.5' into master

Change-Id: I486d6f3f6fbdbfe1b92ccff918aaf0fe72aa2fc8

3 files changed, 6 insertions, 4 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 357bcd883..8b9ada150 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -644,8 +644,6 @@ bool PackageManagerCore::recalculateAllComponents()
     if (!isInstaller() && !calculateComponentsToUninstall())
         return false;
 
-    // update install actions
-    d->updateComponentCheckedState();
     // update all nodes uncompressed size
     foreach (Component *const component, components(ComponentType::Root))
         component->updateUncompressedSize(); // this is a recursive call
@@ -2186,6 +2184,8 @@ bool PackageManagerCore::calculateComponentsToInstall() const
     const bool componentsToInstallCalculated =
         d->installerCalculator()->solve(selectedComponentsToInstall);
 
+    d->updateComponentInstallActions();
+
     emit finishedCalculateComponentsToInstall();
     return componentsToInstallCalculated;
 }
@@ -2291,6 +2291,8 @@ bool PackageManagerCore::calculateComponentsToUninstall() const
     const bool componentsToUninstallCalculated =
         d->uninstallerCalculator()->solve(selectedComponentsToUninstall);
 
+    d->updateComponentInstallActions();
+
     emit finishedCalculateComponentsToUninstall();
     return componentsToUninstallCalculated;
 }
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index bde697b74..259aafeb6 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -2900,7 +2900,7 @@ void PackageManagerCorePrivate::storeCheckState()
         m_coreCheckedHash.insert(component, component->checkState());
 }
 
-void PackageManagerCorePrivate::updateComponentCheckedState()
+void PackageManagerCorePrivate::updateComponentInstallActions()
 {
     for (Component *component : m_core->components(PackageManagerCore::ComponentType::All)) {
         component->setInstallAction(component->isInstalled()
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 6c49015be..74cb0667c 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -274,7 +274,7 @@ private:
     void commitPendingUnstableComponents();
     void createAutoDependencyHash(const QString &componentName, const QString &oldValue, const QString &newValue);
     void createLocalDependencyHash(const QString &componentName, const QString &dependencies);
-    void updateComponentCheckedState();
+    void updateComponentInstallActions();
 
     // remove once we deprecate isSelected, setSelected etc...
     void restoreCheckState();