diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-19 16:39:18 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-19 16:39:18 +0200 |
| commit | c417d953f743b8a273ea36ff7d7b1dc8b761d518 (patch) | |
| tree | 4bc08bf733ba04a7846db8289ba7003a961bad82 /src/libs/installer/packagemanagercore.cpp | |
| parent | c53747138d2f48138ee6e12149064344e668634d (diff) | |
| parent | d343cd20410ecb2741c85877c8203579dc7c227d (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
Changelog
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
src/libs/installer/component.cpp
src/libs/kdtools/updatesinfo.cpp
Change-Id: I0a1b4a464f7d9008b589b54dd7aed0cac71bd666
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 7ee6f5e06..c5cfeb5e9 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -524,7 +524,7 @@ void PackageManagerCore::componentsToInstallNeedsRecalculation() QSet<Component *> componentsToUninstall = d->uninstallerCalculator()->componentsToUninstall(); - foreach (Component *component, components(ComponentType::Root | ComponentType::Descendants)) + foreach (Component *component, components(ComponentType::All)) component->setInstallAction(component->isInstalled() ? ComponentModelHelper::KeepInstalled : ComponentModelHelper::KeepUninstalled); |