Hide the automatic restart page.

Might also fix the double commit button seen by the tester.

Change-Id: I67b0ac36eee97afcc6bba84e4f102ea056ea4bc0
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

3 files changed, 9 insertions, 5 deletions

diff --git a/installerbuilder/installerbase/installerbasecommons.cpp b/installerbuilder/installerbase/installerbasecommons.cpp
index ac64f07e7..57584c0fc 100644
--- a/installerbuilder/installerbase/installerbasecommons.cpp
+++ b/installerbuilder/installerbase/installerbasecommons.cpp
@@ -254,6 +254,7 @@ void IntroductionPageImpl::setUpdater(bool value)
         entering();
         gui()->showSettingsButton(true);
         packageManagerCore()->setUpdater();
+        emit packageManagerCoreTypeChanged();
     }
 }
 
@@ -263,6 +264,7 @@ void IntroductionPageImpl::setUninstaller(bool value)
         entering();
         gui()->showSettingsButton(false);
         packageManagerCore()->setUninstaller();
+        emit packageManagerCoreTypeChanged();
     }
 }
 
@@ -272,6 +274,7 @@ void IntroductionPageImpl::setPackageManager(bool value)
         entering();
         gui()->showSettingsButton(true);
         packageManagerCore()->setPackageManager();
+        emit packageManagerCoreTypeChanged();
     }
 }
 
@@ -481,9 +484,7 @@ MaintenanceGui::MaintenanceGui(PackageManagerCore *core)
     : PackageManagerGui(core, 0)
 {
     IntroductionPageImpl *intro = new IntroductionPageImpl(core);
-    connect(intro, SIGNAL(initUpdater()), this, SLOT(updateRestartPage()));
-    connect(intro, SIGNAL(initUninstaller()), this, SLOT(updateRestartPage()));
-    connect(intro, SIGNAL(initPackageManager()), this, SLOT(updateRestartPage()));
+    connect(intro, SIGNAL(packageManagerCoreTypeChanged()), this, SLOT(updateRestartPage()));
 
     setPage(PackageManagerCore::Introduction, intro);
     setPage(PackageManagerCore::ComponentSelection, new ComponentSelectionPage(core));
diff --git a/installerbuilder/installerbase/installerbasecommons.h b/installerbuilder/installerbase/installerbasecommons.h
index da8ed5e1a..b4945f5b8 100644
--- a/installerbuilder/installerbase/installerbasecommons.h
+++ b/installerbuilder/installerbase/installerbasecommons.h
@@ -63,6 +63,9 @@ public Q_SLOTS:
     void setMessage(const QString &msg);
     void setErrorMessage(const QString &error);
 
+Q_SIGNALS:
+    void packageManagerCoreTypeChanged();
+
 private Q_SLOTS:
     void setUpdater(bool value);
     void setUninstaller(bool value);
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index 0a1026227..f6779276b 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -1916,10 +1916,10 @@ void FinishedPage::leaving()
 {
 #ifdef Q_WS_MAC
     gui()->setOption(QWizard::NoCancelButton, true);
-    if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton))
-        cancel->setVisible(false);
 #endif
 
+    if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton))
+        cancel->setVisible(false);
     gui()->updateButtonLayout();
 
     setButtonText(QWizard::CommitButton, gui()->defaultButtonText(QWizard::CommitButton));