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

Change-Id: I09cacedb966eebc3f42a3402b0b3dc4f6dcd9be8

1 files changed, 4 insertions, 0 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 57f430778..2577f09fc 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -378,11 +378,15 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash<QString, Component*> &c
         // now we can preselect components in the tree
         foreach (QInstaller::Component *component, components) {
             // set the checked state for all components without child (means without tristate)
+            // set checked state also for installed virtual tristate componets as otherwise
+            // those will be uninstalled
             if (component->isCheckable() && !component->isTristate()) {
                 if (component->isDefault() && isInstaller())
                     component->setCheckState(Qt::Checked);
                 else if (component->isInstalled())
                     component->setCheckState(Qt::Checked);
+            } else if (component->isVirtual() && component->isInstalled() && component->isTristate()) {
+                component->setCheckState(Qt::Checked);
             }
         }