From f71049bee4693e61ec8f69ce6fda49f67d2efb3f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 20 Apr 2010 12:56:21 +0200
Subject: [PATCH] Make targetsetuppage work in customwizard
---
src/plugins/projectexplorer/customwizard/customwizard.cpp | 4 +++-
src/plugins/projectexplorer/customwizard/customwizard.h | 3 +++
src/plugins/qt4projectmanager/wizards/qtwizard.cpp | 8 ++++----
src/plugins/qt4projectmanager/wizards/qtwizard.h | 4 ++--
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 829ed1e0288..b9c8e7e18a7 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -438,10 +438,12 @@ bool CustomProjectWizard::postGenerateFiles(const QWizard *, const Core::Generat
return CustomProjectWizard::postGenerateOpen(l, errorMessage);
}
-void CustomProjectWizard::introPageLeft(const QString &project, const QString & /* path */)
+void CustomProjectWizard::introPageLeft(const QString &project, const QString & path)
{
// Make '%ProjectName%' available in base replacements.
context()->baseReplacements.insert(QLatin1String("ProjectName"), project);
+
+ emit projectLocationChanged(path + QChar('/') + project);
}
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h
index 7816bf3aef0..5197004a24c 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.h
+++ b/src/plugins/projectexplorer/customwizard/customwizard.h
@@ -158,6 +158,9 @@ public:
// the respective attributes set.
static bool postGenerateOpen(const Core::GeneratedFiles &l, QString *errorMessage = 0);
+signals:
+ void projectLocationChanged(const QString &path);
+
protected:
virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index 48a0efd6280..a6211f9846b 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -213,7 +213,7 @@ void BaseQt4ProjectWizardDialog::init(bool showModulesPage)
if (showModulesPage)
m_modulesPage = new ModulesPage;
connect(this, SIGNAL(introPageLeft(QString,QString)),
- this, SLOT(propagateProjectName(QString,QString)));
+ this, SLOT(generateProfileName(QString,QString)));
}
int BaseQt4ProjectWizardDialog::addModulesPage(int id)
@@ -233,7 +233,7 @@ int BaseQt4ProjectWizardDialog::addModulesPage(int id)
int BaseQt4ProjectWizardDialog::addTargetSetupPage(QSet<QString> targets, bool mobile, int id)
{
m_targetSetupPage = new TargetSetupPage;
- connect(this, SIGNAL(proFileNameChanged(QString)),
+ connect(this, SIGNAL(projectLocationChanged(QString)),
m_targetSetupPage, SLOT(setProFilePath(QString)));
QList<TargetSetupPage::ImportInfo> infos = TargetSetupPage::importInfosForKnownQtVersions(0);
@@ -315,10 +315,10 @@ bool BaseQt4ProjectWizardDialog::isTargetSelected(const QString &targetid) const
return m_targetSetupPage->isTargetSelected(targetid);
}
-void BaseQt4ProjectWizardDialog::propagateProjectName(const QString &name, const QString &path)
+void BaseQt4ProjectWizardDialog::generateProfileName(const QString &name, const QString &path)
{
const QString proFile = QDir::fromNativeSeparators(path) + QChar('/') + name + QChar('/') + name + QLatin1String(".pro");
- emit proFileNameChanged(proFile);
+ emit projectLocationChanged(proFile);
}
QSet<QString> BaseQt4ProjectWizardDialog::desktopTarget()
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index bd6594a856c..3b8fc4721e0 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -143,10 +143,10 @@ public:
bool isTargetSelected(const QString &targetid) const;
signals:
- void proFileNameChanged(const QString &proFileName);
+ void projectLocationChanged(const QString &proFileName);
private slots:
- void propagateProjectName(const QString &name, const QString &path);
+ void generateProfileName(const QString &name, const QString &path);
private:
inline void init(bool showModulesPage);
--
GitLab