QtQuickApp wizard: Merge Components and Sources page

Change-Id: I48e5009f2f71562a700eabddf38e54c1d4a127c1
Reviewed-on: http://codereview.qt.nokia.com/913
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 0c2d8a3e72..27eda758e4 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -57,7 +57,6 @@ protected:
     bool validateCurrentPage();
 
 private:
-    class QtQuickAppWizardSourcesPage *m_qmlSourcesPage;
     class QtQuickComponentSetOptionsPage *m_componentOptionsPage;
     int m_componentOptionsPageId;
 
@@ -68,22 +67,18 @@ private:
 
 QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent)
     : AbstractMobileAppWizardDialog(parent, QtSupport::QtVersionNumber(4, 7, 1))
-    , m_qmlSourcesPage(0)
 {
     setWindowTitle(tr("New Qt Quick Application"));
     setIntroDescription(tr("This wizard generates a Qt Quick application project."));
 
     m_componentOptionsPage = new Internal::QtQuickComponentSetOptionsPage;
-    m_componentOptionsPageId = addPageWithTitle(m_componentOptionsPage, tr("Component Set"));
+    m_componentOptionsPageId = addPageWithTitle(m_componentOptionsPage, tr("Application Type"));
     m_componentItem = wizardProgress()->item(m_componentOptionsPageId);
 
     AbstractMobileAppWizardDialog::addMobilePages();
 
     m_componentItem->setNextItems(QList<Utils::WizardProgressItem *>()
                                   << targetsPageItem());
-
-    m_qmlSourcesPage = new QtQuickAppWizardSourcesPage;
-    addPageWithTitle(m_qmlSourcesPage, tr("QML Sources"));
 }
 
 bool QtQuickAppWizardDialog::validateCurrentPage()
@@ -163,10 +158,10 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
 {
     Q_UNUSED(errorMessage)
     const QtQuickAppWizardDialog *wizard = qobject_cast<const QtQuickAppWizardDialog*>(w);
-    if (wizard->m_qmlSourcesPage->mainQmlMode() == QtQuickApp::ModeGenerate) {
+    if (wizard->m_componentOptionsPage->mainQmlMode() == QtQuickApp::ModeGenerate) {
         m_d->app->setMainQml(QtQuickApp::ModeGenerate);
     } else {
-        const QString mainQmlFile = wizard->m_qmlSourcesPage->mainQmlFile();
+        const QString mainQmlFile = wizard->m_componentOptionsPage->mainQmlFile();
         m_d->app->setMainQml(QtQuickApp::ModeImport, mainQmlFile);
     }
     m_d->app->setComponentSet(wizard->m_componentOptionsPage->componentSet());