diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 829ed1e0288c209ee6241cdc9dfd57a70a81d673..b9c8e7e18a749dd0fdbc599b89000fa48c0ad926 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 7816bf3aef0c415370eb98defcb4b3d7a2bc3236..5197004a24c9f934c30e4dfeea765016b56ecbc6 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 48a0efd6280a12b7783dcdb17517341587083d9c..a6211f9846b3b10e8605b778f86f77659c001483 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 bd6594a856ca698e6f01d1ff6cbd3cfef4609e1c..3b8fc4721e064d65e77f3153d33f85360c2d79d1 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);