diff options
author | Katja Marttila <katja.marttila@qt.io> | 2017-05-02 13:21:53 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2017-05-02 11:14:00 +0000 |
commit | 535a54337e28185eb9abfd6af1f91c79e2603802 (patch) | |
tree | 4456772c8d5a4be53657b8d9eeb9e3c9fb716a60 /src/libs | |
parent | 4ea0d10d7214cb4ab9e46fec50b48681d2ba77ad (diff) |
Fix unnecessary component calculate in silentUpdate
If there are no updates available, no need to calculate components to
install
Change-Id: I95068ef0e062f1745cbe10138407e658befb2c5b
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index edd2460a8..72e2ec928 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1805,17 +1805,21 @@ void PackageManagerCore::updateComponentsSilently() const QList<QInstaller::Component*> componentList = components( ComponentType::Root | ComponentType::Descendants); - foreach (Component *comp, componentList) { - comp->setCheckState(Qt::Checked); - } - QString htmlOutput; - bool componentsOk = calculateComponents(&htmlOutput); - if (componentsOk) { - if (runPackageUpdater()) - qDebug() << "Components updated successfully."; - } - else { - qDebug() << htmlOutput; + if (componentList.count() == 0) { + qDebug() << "No updates available."; + } else { + foreach (Component *comp, componentList) { + comp->setCheckState(Qt::Checked); + } + QString htmlOutput; + bool componentsOk = calculateComponents(&htmlOutput); + if (componentsOk) { + if (runPackageUpdater()) + qDebug() << "Components updated successfully."; + } + else { + qDebug() << htmlOutput; + } } } |