From d6062643c3994059233fc5e3b082932842c20a81 Mon Sep 17 00:00:00 2001 From: Daniel Teske <daniel.teske@digia.com> Date: Tue, 2 Jul 2013 13:24:40 +0200 Subject: [PATCH] QtQuick Ui Wizard: Create right runconfigurations for Qt Quick 2 ui 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> --- .../qmlprojectmanager/qmlapplicationwizard.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp index ae4dbcf4c64..50cb54bbab2 100644 --- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp @@ -136,22 +136,6 @@ QWizard *QmlApplicationWizard::createWizardDialog(QWidget *parent, 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*/, QString *errorMessage) const { @@ -161,7 +145,6 @@ GeneratedFiles QmlApplicationWizard::generateFiles(const QWizard * /*wizard*/, bool QmlApplicationWizard::postGenerateFiles(const QWizard * /*wizard*/, const GeneratedFiles &l, QString *errorMessage) { - writeUserFile(m_qmlApp->creatorFileName()); return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage); } -- GitLab