summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagergui.cpp
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2016-11-10 12:04:17 +0200
committerKatja Marttila <katja.marttila@qt.io>2016-11-15 06:43:54 +0000
commitb5b0a8d2657f874f09f157246a592a270ea78d87 (patch)
tree457e2a0656eee2c40db6da53f63e3810f6a0a9c1 /src/libs/installer/packagemanagergui.cpp
parente7f93217182233383851a25ae21bd950d05b408a (diff)
Introduces new --silentUpdate command line option
With this feature one can update all installed components silently with maintenancetool by passing --silentUpdate parameter Change-Id: If31d37ce24e794775c2fe47b603259da133c9ee7 Task-number: QTIFW-906 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagergui.cpp')
-rw-r--r--src/libs/installer/packagemanagergui.cpp46
1 files changed, 1 insertions, 45 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 18f8849f9..789a38b40 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -2773,7 +2773,7 @@ void ReadyForInstallationPage::entering()
}
QString htmlOutput;
- bool componentsOk = calculateComponents(&htmlOutput);
+ bool componentsOk = packageManagerCore()->calculateComponents(&htmlOutput);
m_taskDetailsBrowser->setHtml(htmlOutput);
m_taskDetailsBrowser->setVisible(!componentsOk || isVerbose());
setComplete(componentsOk);
@@ -2870,51 +2870,7 @@ void ReadyForInstallationPage::entering()
.arg(humanReadableSize(packageManagerCore()->requiredDiskSpace()))));
}
-bool ReadyForInstallationPage::calculateComponents(QString *displayString)
-{
- QString htmlOutput;
- QString lastInstallReason;
- if (!packageManagerCore()->calculateComponentsToUninstall() ||
- !packageManagerCore()->calculateComponentsToInstall()) {
- htmlOutput.append(QString::fromLatin1("<h2><font color=\"red\">%1</font></h2><ul>")
- .arg(tr("Cannot resolve all dependencies.")));
- //if we have a missing dependency or a recursion we can display it
- if (!packageManagerCore()->componentsToInstallError().isEmpty()) {
- htmlOutput.append(QString::fromLatin1("<li> %1 </li>").arg(
- packageManagerCore()->componentsToInstallError()));
- }
- htmlOutput.append(QLatin1String("</ul>"));
- if (displayString)
- *displayString = htmlOutput;
- return false;
- }
-
- // In case of updater mode we don't uninstall components.
- if (!packageManagerCore()->isUpdater()) {
- QList<Component*> componentsToRemove = packageManagerCore()->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, packageManagerCore()->orderedComponentsToInstall()) {
- const QString installReason = packageManagerCore()->installReason(component);
- if (lastInstallReason != installReason) {
- if (!lastInstallReason.isEmpty()) // means we had to close the previous list
- htmlOutput.append(QLatin1String("</ul>"));
- htmlOutput.append(QString::fromLatin1("<h3>%1</h3><ul>").arg(installReason));
- lastInstallReason = installReason;
- }
- htmlOutput.append(QString::fromLatin1("<li> %1 </li>").arg(component->name()));
- }
- if (displayString)
- *displayString = htmlOutput;
- return true;
-}
/*!
Called when end users leave the page and the PackageManagerGui:currentPageChanged()