feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make targetsetuppage work in customwizard

Browse Source
This commit is contained in:
Tobias Hunger
2010-04-20 12:56:21 +02:00
parent 5678bef399
commit f71049bee4
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/customwizard/customwizard.cpp
View File

@@ -438,10 +438,12 @@ bool CustomProjectWizard::postGenerateFiles(const QWizard *, const Core::Generat
return CustomProjectWizard::postGenerateOpen(l, errorMessage); 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. // Make '%ProjectName%' available in base replacements.
context()->baseReplacements.insert(QLatin1String("ProjectName"), project); context()->baseReplacements.insert(QLatin1String("ProjectName"), project);
emit projectLocationChanged(path + QChar('/') + project);
} }
} // namespace ProjectExplorer } // namespace ProjectExplorer

3
src/plugins/projectexplorer/customwizard/customwizard.h
View File

@@ -158,6 +158,9 @@ public:
// the respective attributes set. // the respective attributes set.
static bool postGenerateOpen(const Core::GeneratedFiles &l, QString *errorMessage = 0); static bool postGenerateOpen(const Core::GeneratedFiles &l, QString *errorMessage = 0);
signals:
void projectLocationChanged(const QString &path);
protected: protected:
virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage); virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);

8
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
View File

@@ -213,7 +213,7 @@ void BaseQt4ProjectWizardDialog::init(bool showModulesPage)
if (showModulesPage) if (showModulesPage)
m_modulesPage = new ModulesPage; m_modulesPage = new ModulesPage;
connect(this, SIGNAL(introPageLeft(QString,QString)), connect(this, SIGNAL(introPageLeft(QString,QString)),
this, SLOT(propagateProjectName(QString,QString))); this, SLOT(generateProfileName(QString,QString)));
} }
int BaseQt4ProjectWizardDialog::addModulesPage(int id) int BaseQt4ProjectWizardDialog::addModulesPage(int id)
@@ -233,7 +233,7 @@ int BaseQt4ProjectWizardDialog::addModulesPage(int id)
int BaseQt4ProjectWizardDialog::addTargetSetupPage(QSet<QString> targets, bool mobile, int id) int BaseQt4ProjectWizardDialog::addTargetSetupPage(QSet<QString> targets, bool mobile, int id)
{ {
m_targetSetupPage = new TargetSetupPage; m_targetSetupPage = new TargetSetupPage;
connect(this, SIGNAL(proFileNameChanged(QString)), connect(this, SIGNAL(projectLocationChanged(QString)),
m_targetSetupPage, SLOT(setProFilePath(QString))); m_targetSetupPage, SLOT(setProFilePath(QString)));
QList<TargetSetupPage::ImportInfo> infos = TargetSetupPage::importInfosForKnownQtVersions(0); QList<TargetSetupPage::ImportInfo> infos = TargetSetupPage::importInfosForKnownQtVersions(0);
@@ -315,10 +315,10 @@ bool BaseQt4ProjectWizardDialog::isTargetSelected(const QString &targetid) const
return m_targetSetupPage->isTargetSelected(targetid); 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"); const QString proFile = QDir::fromNativeSeparators(path) + QChar('/') + name + QChar('/') + name + QLatin1String(".pro");
emit proFileNameChanged(proFile); emit projectLocationChanged(proFile);
} }
QSet<QString> BaseQt4ProjectWizardDialog::desktopTarget() QSet<QString> BaseQt4ProjectWizardDialog::desktopTarget()

4
src/plugins/qt4projectmanager/wizards/qtwizard.h
View File

@@ -143,10 +143,10 @@ public:
bool isTargetSelected(const QString &targetid) const; bool isTargetSelected(const QString &targetid) const;
signals: signals:
void proFileNameChanged(const QString &proFileName); void projectLocationChanged(const QString &proFileName);
private slots: private slots:
void propagateProjectName(const QString &name, const QString &path); void generateProfileName(const QString &name, const QString &path);
private: private:
inline void init(bool showModulesPage); inline void init(bool showModulesPage);