Revert parts of the former changes.

Now reset the core checked list in show event, as this is
not called that frequently as nextId(). Solves the problem
of always recalculating the components to install.

Change-Id: I282d25236441c6a91c833867ce65aa351dcfcc67
Reviewed-on: http://codereview.qt.nokia.com/3503
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index de9d8c050..8695a49ed 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -1120,12 +1120,12 @@ void ComponentSelectionPage::entering()
     setModified(isComplete());
 }
 
-int ComponentSelectionPage::nextId() const
+void ComponentSelectionPage::showEvent(QShowEvent *event)
 {
     // remove once we deprecate isSelected, setSelected etc...
-    const int next = PackageManagerPage::nextId();
-    packageManagerCore()->resetComponentsToUserCheckedState();
-    return next;
+    if (!event->spontaneous())
+        packageManagerCore()->resetComponentsToUserCheckedState();
+    QWizardPage::showEvent(event);
 }
 
 void ComponentSelectionPage::selectAll()