From 975186c7fc59d904c72b4b0d5fd5974fa9497d05 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 9 Sep 2014 17:19:42 +0200 Subject: [PATCH] New Project Wizard: Fix displayname of "None" node on project selection Was broken in 5969c01fa625fa41f0b45907c31c411792c4ffee. Change-Id: I5e6e20ae8570e7c49cb87f429f6d65993fe4618e Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/projectwizardpage.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index c7b93a44e21..18cfae206ca 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -74,6 +74,7 @@ public: BestNodeSelector(const QString &commonDirectory, const QStringList &files); void inspect(AddNewTree *tree); AddNewTree *bestChoice() const; + bool deploys(); QString deployingProjects() const; private: QString m_commonDirectory; @@ -133,6 +134,11 @@ AddNewTree *BestNodeSelector::bestChoice() const return m_bestChoice; } +bool BestNodeSelector::deploys() +{ + return m_deploys; +} + QString BestNodeSelector::deployingProjects() const { if (m_deploys) @@ -146,9 +152,9 @@ QString BestNodeSelector::deployingProjects() const static inline AddNewTree *createNoneNode(BestNodeSelector *selector) { - QString displayName = QCoreApplication::translate("ProjectWizard", ""); - if (selector->bestChoice()) - displayName = QCoreApplication::translate("ProjectWizard", ""); + QString displayName = QCoreApplication::translate("ProjectWizard", ""); + if (selector->deploys()) + displayName = QCoreApplication::translate("ProjectWizard", ""); return new AddNewTree(displayName); }