Fix missing redraw while pages are hidden but still existent.

Task-number: QTIFW-206

Fix issue when several pages are hidden, e.g. license and select
components page, caused by the fact that we've overwriten the wrong
virtual QWizard*::nextId() function.

We need to implement the logic inside the wizards page nextId()
function, as that one is called by the wizard anyway and by all
pages that call either QWizardPage::nextId() or QWizard::nextId().

Change-Id: I377c007be618431d708cb2712a86d61d0d4e104d
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

1 files changed, 0 insertions, 40 deletions

diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index 4a935356c..6ae1ddc3a 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -526,25 +526,6 @@ void InstallerGui::init()
 {
 }
 
-int InstallerGui::nextId() const
-{
-    const int next = QWizard::nextId();
-    if (next == PackageManagerCore::LicenseCheck) {
-        PackageManagerCore *const core = packageManagerCore();
-        const int nextNextId = pageIds().value(pageIds().indexOf(next)+ 1, -1);
-        if (!core->isInstaller())
-            return nextNextId;
-
-        core->calculateComponentsToInstall();
-        foreach (Component* component, core->orderedComponentsToInstall()) {
-            if (!component->licenses().isEmpty())
-                return next;
-        }
-        return nextNextId;
-    }
-    return next;
-}
-
 
 // -- MaintenanceGui
 
@@ -573,27 +554,6 @@ void MaintenanceGui::init()
 {
 }
 
-int MaintenanceGui::nextId() const
-{
-    const int next = QWizard::nextId();
-    if (next == PackageManagerCore::LicenseCheck) {
-        PackageManagerCore *const core = packageManagerCore();
-        const int nextNextId = pageIds().value(pageIds().indexOf(next)+ 1, -1);
-        if (!core->isPackageManager() && !core->isUpdater())
-            return nextNextId;
-
-        core->calculateComponentsToInstall();
-        foreach (Component* component, core->orderedComponentsToInstall()) {
-            if (component->isInstalled())
-                continue;
-            if (!component->licenses().isEmpty())
-                return next;
-        }
-        return nextNextId;
-    }
-    return next;
-}
-
 void MaintenanceGui::updateRestartPage()
 {
     wizardPageVisibilityChangeRequested((packageManagerCore()->isUninstaller() ? false : true),