feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move Targets page before Summary page in plain C/C++ project wizard

Browse Source 
Task-number: QTCREATORBUG-7608

Change-Id: I9ae8758a28140b7cc7594bdb17a7e2e3aa4311f6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Jarek Kobus
2012-07-04 15:57:54 +02:00
parent 234a6454aa
commit 9fb9a94eba
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
View File

@@ -171,11 +171,11 @@ CustomQt4ProjectWizard::CustomQt4ProjectWizard(const Core::BaseFileWizardParamet
{ {
BaseQt4ProjectWizardDialog *wizard = new BaseQt4ProjectWizardDialog(false, parent, wizardDialogParameters); 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)) if (!wizardDialogParameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_PROFILE_IDS))
wizard->addTargetSetupPage(false, targetPageId); wizard->addTargetSetupPage(false, targetPageId);
initProjectWizardDialog(wizard, wizardDialogParameters.defaultPath(),
wizardDialogParameters.extensionPages());
return wizard; return wizard;
} }
@@ -256,7 +256,6 @@ int BaseQt4ProjectWizardDialog::addTargetSetupPage(bool mobile, int id)
m_targetSetupPage->setRequiredProfileMatcher(new QtSupport::QtVersionProfileMatcher(requiredFeatures())); m_targetSetupPage->setRequiredProfileMatcher(new QtSupport::QtVersionProfileMatcher(requiredFeatures()));
resize(900, 450); resize(900, 450);
if (id >= 0) if (id >= 0)
setPage(id, m_targetSetupPage); setPage(id, m_targetSetupPage);
else else

2
src/plugins/qt4projectmanager/wizards/qtwizard.h
View File

@@ -109,7 +109,7 @@ protected:
virtual bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage); virtual bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage);
private: private:
enum { targetPageId = 2 }; enum { targetPageId = 1 };
}; };
/* BaseQt4ProjectWizardDialog: Additionally offers modules page /* BaseQt4ProjectWizardDialog: Additionally offers modules page