diff options
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 6 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index db6c692e2..6a449c69a 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -633,8 +633,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()->appendComponentsToInstall(selectedComponentsToInstall); + d->updateComponentInstallActions(); + emit finishedCalculateComponentsToInstall(); return componentsToInstallCalculated; } @@ -2291,6 +2291,8 @@ bool PackageManagerCore::calculateComponentsToUninstall() const const bool componentsToUninstallCalculated = d->uninstallerCalculator()->appendComponentsToUninstall(selectedComponentsToUninstall); + d->updateComponentInstallActions(); + emit finishedCalculateComponentsToUninstall(); return componentsToUninstallCalculated; } diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 6d56791a0..cce093dc2 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -2922,7 +2922,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 aaf9e27be..f316d0363 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(); |