Commit 44eef03c authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Update the target setup page with the pro-file name

... so that we can sanity check.
parent f37824a6
......@@ -212,6 +212,8 @@ void BaseQt4ProjectWizardDialog::init(bool showModulesPage)
{
if (showModulesPage)
m_modulesPage = new ModulesPage;
connect(this, SIGNAL(introPageLeft(QString,QString)),
this, SLOT(propagateProjectName(QString,QString)));
}
int BaseQt4ProjectWizardDialog::addModulesPage(int id)
......@@ -231,6 +233,9 @@ int BaseQt4ProjectWizardDialog::addModulesPage(int id)
int BaseQt4ProjectWizardDialog::addTargetSetupPage(QSet<QString> targets, bool mobile, int id)
{
m_targetSetupPage = new TargetSetupPage;
connect(this, SIGNAL(proFileNameChanged(QString)),
m_targetSetupPage, SLOT(setProFilePath(QString)));
QList<TargetSetupPage::ImportInfo> infos = TargetSetupPage::importInfosForKnownQtVersions(0);
if (!targets.isEmpty())
infos = TargetSetupPage::filterImportInfos(targets, infos);
......@@ -310,6 +315,12 @@ bool BaseQt4ProjectWizardDialog::isTargetSelected(const QString &targetid) const
return m_targetSetupPage->isTargetSelected(targetid);
}
void BaseQt4ProjectWizardDialog::propagateProjectName(const QString &name, const QString &path)
{
const QString proFile = QDir::fromNativeSeparators(path) + QChar('/') + name + QChar('/') + name + QLatin1String(".pro");
emit proFileNameChanged(proFile);
}
QSet<QString> BaseQt4ProjectWizardDialog::desktopTarget()
{
QSet<QString> rc;
......
......@@ -142,6 +142,12 @@ public:
bool setupProject(Qt4Project *project) const;
bool isTargetSelected(const QString &targetid) const;
signals:
void proFileNameChanged(const QString &proFileName);
private slots:
void propagateProjectName(const QString &name, const QString &path);
private:
inline void init(bool showModulesPage);
......
......@@ -92,7 +92,6 @@ public:
void setImportDirectoryBrowsingLocation(const QString &directory);
void setShowLocationInformation(bool location);
void setPreferMobile(bool mobile);
void setProFilePath(const QString &dir);
static QList<ImportInfo> importInfosForKnownQtVersions(Qt4ProjectManager::Qt4Project *project);
static QList<ImportInfo> filterImportInfos(const QSet<QString> &validTargets,
......@@ -107,6 +106,9 @@ public:
bool setupProject(Qt4Project *project);
public slots:
void setProFilePath(const QString &dir);
private slots:
void itemWasChanged();
void addShadowBuildLocation();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment