diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-13 10:52:57 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-09-27 14:34:43 +0200 |
| commit | 921f86dfa748468a8d7e6bb7787aed8fb8b53da9 (patch) | |
| tree | 717cc0cd5052ff7a75f27f11e5abb9143fd35447 /src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp | |
| parent | 95828d4691a993e552843738114507a5a30efe2a (diff) | |
TargetSetupPage: Generalize the page
Generalize the target setup page and move it into projectexplorer
Move the qmake specific code into a projectimporter class with
a specialization for qmake projects in the qt4projectmanager.
This change depends heavily on the BuildConfigurationFactory cleanups
done earlier and completes that change in such a way that generic
build configuration factories are now in theory possible. The
remaining problem is how to select the best factory of several that
claim to be able to handle a kit and that is left for the next patch.
Change-Id: I47134cb1938c52adebcdc1ddfe8dbf26abbbbeee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index 04afef13f2..660fcba083 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -31,12 +31,12 @@ #include "qtquickapp.h" #include "qtquickappwizardpages.h" -#include "targetsetuppage.h" -#include <qt4projectmanager/qt4projectmanagerconstants.h> +#include "qt4projectmanagerconstants.h" #include <qtsupport/qtsupportconstants.h> #include <qtsupport/baseqtversion.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/targetsetuppage.h> #include <QIcon> #include <QDebug> @@ -226,7 +226,7 @@ AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWid void QtQuickAppWizard::projectPathChanged(const QString &path) const { if (d->wizardDialog->targetsPage()) - d->wizardDialog->targetsPage()->setProFilePath(path); + d->wizardDialog->targetsPage()->setProjectPath(path); } void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w, |