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

Make BaseFileWizard async

Browse Source 
The side-effect is that WizardEventLoop can go!

Change-Id: I0eae0e0fa91a48e2a5010b47cc0de86758969904
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-05-29 17:25:40 +02:00
parent 9d0c39768f
commit 093a54cbb8
32 changed files with 287 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/genericprojectmanager/genericprojectwizard.cpp
View File

@@ -60,8 +60,9 @@ static const char *const ConfigFileTemplate =
//
//////////////////////////////////////////////////////////////////////////////
GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent) :
Core::BaseFileWizard(parent)
GenericProjectWizardDialog::GenericProjectWizardDialog(const Core::BaseFileWizardFactory *factory,
QWidget *parent) :
Core::BaseFileWizard(factory, QVariantMap(), parent)
{
setWindowTitle(tr("Import Existing Project"));
@@ -129,13 +130,14 @@ GenericProjectWizard::GenericProjectWizard()
setFlags(Core::IWizardFactory::PlatformIndependent);
}
Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent,
const Core::WizardDialogParameters &parameters) const
{
GenericProjectWizardDialog *wizard = new GenericProjectWizardDialog(parent);
GenericProjectWizardDialog *wizard = new GenericProjectWizardDialog(this, parent);
wizard->setPath(parameters.defaultPath());
foreach (QWizardPage *p, parameters.extensionPages())
foreach (QWizardPage *p, wizard->extensionPages())
wizard->addPage(p);
return wizard;
@@ -200,7 +202,8 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
return files;
}
bool GenericProjectWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage)
bool GenericProjectWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l,
QString *errorMessage) const
{
Q_UNUSED(w);
return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage);