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

Merge remote-tracking branch 'origin/2.5'

Browse Source
This commit is contained in:
Eike Ziller
2012-04-04 16:20:10 +02:00
parent 12624eb7f4 06aa0363b0
commit c814538d95
40 changed files with 218 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/basefilewizard.cpp
View File

@@ -434,7 +434,7 @@ QString BaseFileWizard::descriptionImage() const
return d->m_parameters.descriptionImage();
}
void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QString &platform)
void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues)
{
QTC_ASSERT(!path.isEmpty(), return);
@@ -500,7 +500,7 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
}
if (firstExtensionPageHit)
foreach (IFileWizardExtension *ex, extensions)
ex->firstExtensionPageShown(files);
ex->firstExtensionPageShown(files, extraValues);
if (accepted)
break;
}