Skip to content
Snippets Groups Projects
Commit d6062643 authored by Daniel Teske's avatar Daniel Teske
Browse files

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: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent c531970b
No related branches found
No related tags found
No related merge requests found
...@@ -136,22 +136,6 @@ QWizard *QmlApplicationWizard::createWizardDialog(QWidget *parent, ...@@ -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*/, ...@@ -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);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment