Fix the order of mobile wizards' items

Task-number: QTCREATORBUG-5706

Change-Id: Iaaa5d7ccdb2948bc4ef2ae234ade8e769e22737a
Reviewed-on: http://codereview.qt.nokia.com/2520
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

1 files changed, 7 insertions, 13 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 55f9c6ddee..8fb4217fe5 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -93,8 +93,7 @@ void AbstractMobileAppWizardDialog::addMobilePages()
     m_maemoItem = wizardProgress()->item(m_maemoOptionsPageId);
     m_harmattanItem = wizardProgress()->item(m_harmattanOptionsPageId);
 
-    m_genericItem->setNextShownItem(0);
-    m_symbianItem->setNextShownItem(0);
+    m_targetItem->setNextShownItem(0);
 }
 
 TargetSetupPage *AbstractMobileAppWizardDialog::targetsPage() const
@@ -151,12 +150,16 @@ void AbstractMobileAppWizardDialog::initializePage(int id)
 {
     if (id == startId()) {
         m_targetItem->setNextItems(QList<Utils::WizardProgressItem *>()
-            << m_genericItem << m_maemoItem << m_harmattanItem << itemOfNextGenericPage());
+            << m_genericItem << m_symbianItem << m_maemoItem << m_harmattanItem << itemOfNextGenericPage());
         m_genericItem->setNextItems(QList<Utils::WizardProgressItem *>()
             << m_symbianItem << m_maemoItem);
         m_symbianItem->setNextItems(QList<Utils::WizardProgressItem *>()
             << m_maemoItem << m_harmattanItem << itemOfNextGenericPage());
-    } else if (id == m_genericOptionsPageId) {
+        m_maemoItem->setNextItems(QList<Utils::WizardProgressItem *>()
+            << m_harmattanItem << itemOfNextGenericPage());
+    } else if (id == m_genericOptionsPageId
+               || id == m_symbianOptionsPageId
+               || id == m_maemoOptionsPageId) {
         QList<Utils::WizardProgressItem *> order;
         order << m_genericItem;
         if (isSymbianTargetSelected())
@@ -173,15 +176,6 @@ void AbstractMobileAppWizardDialog::initializePage(int id)
     BaseProjectWizardDialog::initializePage(id);
 }
 
-void AbstractMobileAppWizardDialog::cleanupPage(int id)
-{
-    if (id == m_genericOptionsPageId) {
-        m_genericItem->setNextShownItem(0);
-        m_symbianItem->setNextShownItem(0);
-    }
-    BaseProjectWizardDialog::cleanupPage(id);
-}
-
 void AbstractMobileAppWizardDialog::setIgnoreGenericOptionsPage(bool ignore)
 {
     m_ignoreGeneralOptions = ignore;