diff options
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index 9be35ad170..8b94e4cdf6 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -30,7 +30,7 @@ #include "abstractmobileappwizard.h" #include "mobileappwizardpages.h" -#include "targetsetuppage.h" +#include "../qmakeprojectimporter.h" #include <extensionsystem/pluginmanager.h> #include <qt4projectmanager/qt4project.h> @@ -38,6 +38,7 @@ #include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtkitinformation.h> #include <projectexplorer/projectexplorer.h> +#include <projectexplorer/targetsetuppage.h> #include <projectexplorer/customwizard/customwizard.h> #include <coreplugin/editormanager/editormanager.h> @@ -64,7 +65,8 @@ AbstractMobileAppWizardDialog::AbstractMobileAppWizardDialog(QWidget *parent, .value<QList<Core::Id> >()) { if (!parameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS))) { - m_targetsPage = new TargetSetupPage; + m_targetsPage = new ProjectExplorer::TargetSetupPage; + m_targetsPage->setProjectImporter(new Internal::QmakeProjectImporter(path())); QString platform = selectedPlatform(); if (platform.isEmpty()) { m_targetsPage->setPreferredKitMatcher( @@ -120,7 +122,7 @@ void AbstractMobileAppWizardDialog::addMobilePages() m_targetItem->setNextShownItem(0); } -TargetSetupPage *AbstractMobileAppWizardDialog::targetsPage() const +ProjectExplorer::TargetSetupPage *AbstractMobileAppWizardDialog::targetsPage() const { return m_targetsPage; } @@ -295,7 +297,7 @@ void AbstractMobileAppWizard::useProjectPath(const QString &projectName, app()->setProjectName(projectName); app()->setProjectPath(projectPath); if (wizardDialog()->m_targetsPage) - wizardDialog()->m_targetsPage->setProFilePath(app()->path(AbstractMobileApp::AppPro)); + wizardDialog()->m_targetsPage->setProjectPath(app()->path(AbstractMobileApp::AppPro)); projectPathChanged(app()->path(AbstractMobileApp::AppPro)); } |