From f3e8ccafa5af6b6b52ff9ead30fa602c155cffcf Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Date: Fri, 10 Apr 2015 12:22:46 +0200
Subject: 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>
---
 src/libs/installer/packagemanagercore_p.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/libs')

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*>());
-- 
cgit v1.2.3