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, 10 insertions, 20 deletions

diff --git a/installerbuilder/installerbase/installerbasecommons.cpp b/installerbuilder/installerbase/installerbasecommons.cpp
index 0f223c6d5..b483f4adb 100644
--- a/installerbuilder/installerbase/installerbasecommons.cpp
+++ b/installerbuilder/installerbase/installerbasecommons.cpp
@@ -343,16 +343,12 @@ int InstallerGui::nextId() const
         if (!core->isInstaller())
             return nextNextId;
 
-        QList<Component*> components = core->orderedComponentsToInstall();
-        bool foundLicense = false;
-
-        foreach (Component* component, components) {
-            if (!component->licenses().isEmpty()) {
-                foundLicense = true;
-                break;
-            }
+        core->calculateComponentsToInstall();
+        foreach (Component* component, core->orderedComponentsToInstall()) {
+            if (!component->licenses().isEmpty())
+                return next;
         }
-        return foundLicense ? next : nextNextId;
+        return nextNextId;
     }
     return next;
 }
@@ -396,20 +392,14 @@ int MaintenanceGui::nextId() const
         if (!core->isPackageManager() && !core->isUpdater())
             return nextNextId;
 
-        QList<Component*> components = core->orderedComponentsToInstall();
-        if (components.isEmpty())
-            return nextNextId;
-
-        bool foundLicense = false;
-        foreach (Component* component, components) {
+        core->calculateComponentsToInstall();
+        foreach (Component* component, core->orderedComponentsToInstall()) {
             if (component->isInstalled())
                 continue;
-            if (!component->licenses().isEmpty()) {
-                foundLicense = true;
-                break;
-            }
+            if (!component->licenses().isEmpty())
+                return next;
         }
-        return foundLicense ? next : nextNextId;
+        return nextNextId;
     }
     return next;
 }