From 9fb9a94eba3b41dabd968b77d4152f34be594d94 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 4 Jul 2012 15:57:54 +0200 Subject: [PATCH] Move Targets page before Summary page in plain C/C++ project wizard Task-number: QTCREATORBUG-7608 Change-Id: I9ae8758a28140b7cc7594bdb17a7e2e3aa4311f6 Reviewed-by: Daniel Teske --- src/plugins/qt4projectmanager/wizards/qtwizard.cpp | 7 +++---- src/plugins/qt4projectmanager/wizards/qtwizard.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp index 2848cc752ae..0223331bb7e 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp @@ -171,11 +171,11 @@ CustomQt4ProjectWizard::CustomQt4ProjectWizard(const Core::BaseFileWizardParamet { BaseQt4ProjectWizardDialog *wizard = new BaseQt4ProjectWizardDialog(false, parent, wizardDialogParameters); - initProjectWizardDialog(wizard, wizardDialogParameters.defaultPath(), wizardDialogParameters.extensionPages()); - if (wizard->pageIds().contains(targetPageId)) - qWarning("CustomQt4ProjectWizard: Unable to insert target page at %d", int(targetPageId)); if (!wizardDialogParameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_PROFILE_IDS)) wizard->addTargetSetupPage(false, targetPageId); + + initProjectWizardDialog(wizard, wizardDialogParameters.defaultPath(), + wizardDialogParameters.extensionPages()); return wizard; } @@ -256,7 +256,6 @@ int BaseQt4ProjectWizardDialog::addTargetSetupPage(bool mobile, int id) m_targetSetupPage->setRequiredProfileMatcher(new QtSupport::QtVersionProfileMatcher(requiredFeatures())); resize(900, 450); - if (id >= 0) setPage(id, m_targetSetupPage); else diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h index b997730ee68..b8f2da9786b 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.h +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h @@ -109,7 +109,7 @@ protected: virtual bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage); private: - enum { targetPageId = 2 }; + enum { targetPageId = 1 }; }; /* BaseQt4ProjectWizardDialog: Additionally offers modules page