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

Change-Id: I486d6f3f6fbdbfe1b92ccff918aaf0fe72aa2fc8

1 files changed, 4 insertions, 2 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;
 }