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

Fix replacement of variables in wizard parameters.

Browse Source 
This was broken in case of no targets page being used, and using
the project name variable in default values for wizard parameters in the
page following the intro page (like it is done in the hello world
wizard).

Reviewed-by: Friedemann Kleint
This commit is contained in:
con
2010-10-27 12:51:33 +02:00
parent 54569c0624
commit 6954d89893
8 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/baseprojectwizarddialog.cpp
View File

@@ -44,14 +44,12 @@ struct BaseProjectWizardDialogPrivate {
const int desiredIntroPageId;
Utils::ProjectIntroPage *introPage;
int introPageId;
int lastId;
};
BaseProjectWizardDialogPrivate::BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id) :
desiredIntroPageId(id),
introPage(page),
introPageId(-1),
lastId(-1)
introPageId(-1)
{
}
@@ -82,7 +80,7 @@ void BaseProjectWizardDialog::init()
}
wizardProgress()->item(d->introPageId)->setTitle(tr("Location"));
connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotBaseCurrentIdChanged(int)));
connect(this, SIGNAL(nextClicked()), this, SLOT(nextClicked()));
}
BaseProjectWizardDialog::~BaseProjectWizardDialog()
@@ -125,12 +123,11 @@ void BaseProjectWizardDialog::slotAccepted()
}
}
void BaseProjectWizardDialog::slotBaseCurrentIdChanged(int id)
void BaseProjectWizardDialog::nextClicked()
{
if (d->lastId == d->introPageId) {
emit introPageLeft(d->introPage->projectName(), d->introPage->path());
if (currentId() == d->introPageId) {
emit projectParametersChanged(d->introPage->projectName(), d->introPage->path());
}
d->lastId = id;
}
Utils::ProjectIntroPage *BaseProjectWizardDialog::introPage() const