diff options
author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-04-10 12:22:46 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-04-15 08:09:52 +0000 |
commit | f3e8ccafa5af6b6b52ff9ead30fa602c155cffcf (patch) | |
tree | d959602fc9e321b0984e196e2d96492cb3b0d54f /src/libs | |
parent | 4fff02a58beeb7e7890e8560f44cc6c7f7ce2a9b (diff) |
Move the component checker after installer calculator.
In this way we first check for errors, then check for warnings.
Change-Id: I3993498c9c517e7900d789fc0f04c59f9c150e14
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index ebaf4d92c..b03d11da3 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -374,10 +374,6 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash<QString, Component*> &c else if (component->isInstalled()) component->setCheckState(Qt::Checked); } - - const QStringList warnings = ComponentChecker::checkComponent(component); - foreach (const QString &warning, warnings) - qWarning() << warning; } std::sort(m_rootComponents.begin(), m_rootComponents.end(), Component::SortingPriorityGreaterThan()); @@ -396,6 +392,11 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash<QString, Component*> &c restoreCheckState(); + foreach (QInstaller::Component *component, components) { + const QStringList warnings = ComponentChecker::checkComponent(component); + foreach (const QString &warning, warnings) + qWarning() << warning; + } } catch (const Error &error) { clearAllComponentLists(); emit m_core->finishAllComponentsReset(QList<QInstaller::Component*>()); |