summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-05-15 12:03:57 +0300
committerKatja Marttila <katja.marttila@qt.io>2018-05-17 08:24:14 +0000
commitf27a9e14d0b4a0e5c39b25162abed9cc793baa41 (patch)
tree3dec07dfac00bdc3051a8034e3a2f7a8a5433d31
parent1642cd883d7a9a6961122531aa13f33a5f960d6c (diff)
Fix ForcedInstallation components uninstall in deselectAll
We don't need to check the installed() state here as we do it already when preselecting components in the tree Task-number: QTIFW-1142 Change-Id: I3540a02f39ea7b379db6597c75d7fee76cc4caab Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--src/libs/installer/componentmodel.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libs/installer/componentmodel.cpp b/src/libs/installer/componentmodel.cpp
index 57fc05181..e445bd089 100644
--- a/src/libs/installer/componentmodel.cpp
+++ b/src/libs/installer/componentmodel.cpp
@@ -580,13 +580,9 @@ QSet<QModelIndex> ComponentModel::updateCheckedState(const ComponentSet &compone
if (node->value(scCheckable, scTrue).toLower() == scFalse) {
checkable = false;
}
- // 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())) {
+
+ if ((!node->isCheckable() && checkable) || !node->isEnabled() || !node->autoDependencies().isEmpty())
continue;
- }
Qt::CheckState newState = state;
const Qt::CheckState recentState = node->checkState();