diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-03-14 15:12:49 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-03-18 13:01:17 +0200 |
| commit | 72939d59553ba00d50df72bfb28367595c5e7425 (patch) | |
| tree | 338ff0a45fc226d04833b26fbe9d59a2be827620 | |
| parent | 0486535dc1e2cc8a902ee8625a822384e6c26e1e (diff) | |
Show 'components to be removed' message in updater view
Components might be uninstalled also in updater view, for example if the
component is replaced with another components. This was not shown to the
user.
Task-number: QTIFW-2576
Change-Id: I143324eeb4830d15a718005992b3cb35d0f6696d
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 820c97cb9..f0b923024 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -2129,16 +2129,13 @@ bool PackageManagerCore::calculateComponents(QString *displayString) return false; } - // In case of updater mode we don't uninstall components. - if (!isUpdater()) { - QList<Component*> componentsToRemove = componentsToUninstall(); - if (!componentsToRemove.isEmpty()) { - htmlOutput.append(QString::fromLatin1("<h3>%1</h3><ul>").arg(tr("Components about to " - "be removed."))); - foreach (Component *component, componentsToRemove) - htmlOutput.append(QString::fromLatin1("<li> %1 </li>").arg(component->name())); - htmlOutput.append(QLatin1String("</ul>")); - } + QList<Component*> componentsToRemove = componentsToUninstall(); + if (!componentsToRemove.isEmpty()) { + htmlOutput.append(QString::fromLatin1("<h3>%1</h3><ul>").arg(tr("Components about to " + "be removed."))); + foreach (Component *component, componentsToRemove) + htmlOutput.append(QString::fromLatin1("<li> %1 </li>").arg(component->name())); + htmlOutput.append(QLatin1String("</ul>")); } foreach (Component *component, orderedComponentsToInstall()) { |