Library/Unit Test/Custom Widget Wizard: Add Target page.

Handle target page correctly. Remove static enumerations
of page ids by member variables to handle differing
page setups. Fix page switching logic in library wizard.

Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

src/plugins/qt4projectmanager/wizards/qtwizard.cpp

@@ -32,6 +32,7 @@
 #include "qt4project.h"
 #include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
+#include "qt4target.h"
 #include "modulespage.h"
 #include "targetspage.h"
 
@@ -192,34 +193,34 @@ void BaseQt4ProjectWizardDialog::init(bool showModulesPage)
         m_targetsPage = new TargetsPage;
 }
 
-void BaseQt4ProjectWizardDialog::addModulesPage(int id)
+int BaseQt4ProjectWizardDialog::addModulesPage(int id)
 {
-    if (m_modulesPage) {
-        if (id >= 0) {
-            setPage(id, m_modulesPage);
-        } else {
-            addPage(m_modulesPage);
-        }
+    if (!m_modulesPage)
+        return -1;
+    if (id >= 0) {
+        setPage(id, m_modulesPage);
+        return id;
     }
+    return addPage(m_modulesPage);
 }
 
-void BaseQt4ProjectWizardDialog::addTargetsPage(QSet<QString> targets, int id)
+int BaseQt4ProjectWizardDialog::addTargetsPage(QSet<QString> targets, int id)
 {
     if (!m_targetsPage)
-        return;
+        return -1;
 
     m_targetsPage->setValidTargets(targets);
 
     if (!m_targetsPage->needToDisplayPage())
-        return;
+        return -1;
 
-    if (id >= 0)
+    if (id >= 0) {
         setPage(id, m_targetsPage);
-    else
-        addPage(m_targetsPage);
+        return id;
+    }
+    return addPage(m_targetsPage);
 }
 
-
 QString BaseQt4ProjectWizardDialog::selectedModules() const
 {
     return m_modulesPage ? m_modulesPage->selectedModules() : m_selectedModules;
@@ -265,3 +266,10 @@ QList<int> BaseQt4ProjectWizardDialog::selectedQtVersionIdsForTarget(const QStri
         return QList<int>();
     return m_targetsPage->selectedVersionIdsForTarget(target);
 }
+
+QSet<QString> BaseQt4ProjectWizardDialog::desktopTarget()
+{
+    QSet<QString> rc;
+    rc.insert(QLatin1String(DESKTOP_TARGET_ID));
+    return rc;
+}