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

Change-Id: I09cacedb966eebc3f42a3402b0b3dc4f6dcd9be8

1 files changed, 6 insertions, 2 deletions

diff --git a/src/libs/installer/componentmodel.cpp b/src/libs/installer/componentmodel.cpp
index 8becdb191..8201248f8 100644
--- a/src/libs/installer/componentmodel.cpp
+++ b/src/libs/installer/componentmodel.cpp
@@ -584,9 +584,13 @@ QSet<QModelIndex> ComponentModel::updateCheckedState(const ComponentSet &compone
         if (node->value(scCheckable, scTrue).toLower() == scFalse) {
             checkable = false;
         }
-
-        if ((!node->isCheckable() && checkable) || !node->isEnabled() || !node->autoDependencies().isEmpty())
+        // Let the check state to be checked up if the node is installed even if the component is not
+        // selectable/enabled or is installed as autodependency. Otherwise the node might not be selected
+        // and installer thinks it should be uninstalled.
+        if (!node->isInstalled() &&
+                ((!node->isCheckable() && checkable) || !node->isEnabled() || !node->autoDependencies().isEmpty())) {
             continue;
+        }
 
         Qt::CheckState newState = state;
         const Qt::CheckState recentState = node->checkState();