Make sure we only calculate the components on actual change.

Change-Id: I5967f2fa2cba3e54519a4b8b5155b570d34d7a22
Reviewed-on: http://codereview.qt.nokia.com/3333
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

1 files changed, 20 insertions, 12 deletions

diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index dd04beec8..ca1b1cd67 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -293,6 +293,11 @@ void PackageManagerCore::cancelMetaInfoJob()
         d->m_repoMetaInfoJob->cancel();
 }
 
+void PackageManagerCore::componentsToInstallNeedsRecalculation()
+{
+    d->m_componentsToInstallCalculated = false;
+}
+
 void PackageManagerCore::autoAcceptMessageBoxes()
 {
     MessageBoxHandler::instance()->setDefaultAction(MessageBoxHandler::Accept);
@@ -875,20 +880,23 @@ Component* PackageManagerCore::componentByName(const QString &name) const
 */
 bool PackageManagerCore::calculateComponentsToInstall() const
 {
-    d->clearComponentsToInstall();
-    QList<Component*> components;
-    if (runMode() == UpdaterMode) {
-        foreach(Component *component, updaterComponents()) {
-            if (component->updateRequested())
-                components.append(component);
-        }
-    } else if (runMode() == AllMode) {
-        foreach(Component *component, availableComponents()) {
-            if (component->installationRequested())
-                components.append(component);
+    if (!d->m_componentsToInstallCalculated) {
+        d->clearComponentsToInstall();
+        QList<Component*> components;
+        if (runMode() == UpdaterMode) {
+            foreach (Component *component, updaterComponents()) {
+                if (component->updateRequested())
+                    components.append(component);
+            }
+        } else if (runMode() == AllMode) {
+            foreach (Component *component, availableComponents()) {
+                if (component->installationRequested())
+                    components.append(component);
+            }
         }
+        d->m_componentsToInstallCalculated = d->appendComponentsToInstall(components);
     }
-    return d->appendComponentsToInstall(components);
+    return d->m_componentsToInstallCalculated;
 }
 
 /*!