diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-21 14:18:07 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-21 14:18:07 +0200 |
commit | ffed7d2b6d212e67946d4fa9c6ff7e84ea25e460 (patch) | |
tree | b2f1701a1e7baa2c1b625e3a6f71cceab8731307 /src/libs/installer/packagemanagercore_p.cpp | |
parent | da6ed2851f3e18c0b004992ff22d0b4acbf25650 (diff) | |
parent | 57007dc93cf60596238a5586af352abcd20df398 (diff) |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
Changelog
Change-Id: Idd7d569f97fba75b05bfc006c7a5b0b9cf8ccf73
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-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 a97c83226..be7b0317d 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*>()); |