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

QtQuick Ui Wizard: Create right runconfigurations for Qt Quick 2 ui

Browse Source 
The wizard doesn't need to write a .user file, the code in fromMap
handles that case.

Task-number: QTCREATORBUG-9678
Change-Id: Iea308fb8afd1248b8bf15d5825ba94b95b4916a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Daniel Teske
2013-07-02 13:24:40 +02:00
parent c531970b57
commit d6062643c3
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
View File

@@ -136,22 +136,6 @@ QWizard *QmlApplicationWizard::createWizardDialog(QWidget *parent,
return wizardDialog; return wizardDialog;
} }
void QmlApplicationWizard::writeUserFile(const QString &fileName) const
{
Manager *manager = ExtensionSystem::PluginManager::getObject<Manager>();
QmlProject *project = new QmlProject(manager, fileName);
QtSupport::QtVersionKitMatcher featureMatcher(requiredFeatures());
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::instance()->kits();
foreach (ProjectExplorer::Kit *kit, kits)
if (featureMatcher.matches(kit)
&& project->supportsKit(kit, 0)) // checks for desktop device
project->addTarget(project->createTarget(kit));
project->saveSettings();
delete project;
}
GeneratedFiles QmlApplicationWizard::generateFiles(const QWizard * /*wizard*/, GeneratedFiles QmlApplicationWizard::generateFiles(const QWizard * /*wizard*/,
QString *errorMessage) const QString *errorMessage) const
{ {
@@ -161,7 +145,6 @@ GeneratedFiles QmlApplicationWizard::generateFiles(const QWizard * /*wizard*/,
bool QmlApplicationWizard::postGenerateFiles(const QWizard * /*wizard*/, const GeneratedFiles &l, bool QmlApplicationWizard::postGenerateFiles(const QWizard * /*wizard*/, const GeneratedFiles &l,
QString *errorMessage) QString *errorMessage)
{ {
writeUserFile(m_qmlApp->creatorFileName());
return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage); return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage);
} }