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

JsonKitsPage: Clarify unexpanded/expanded project path

Browse Source 
Change-Id: I62a04582d29b122f6210b3bcef0d3e5e26d5286e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2014-11-21 14:00:25 +01:00
parent d295b304d1
commit 78f1b24cd4
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
View File

@@ -60,12 +60,10 @@ void JsonKitsPage::initializePage()
const QString platform = wiz->value(QLatin1String("Platform")).toString(); const QString platform = wiz->value(QLatin1String("Platform")).toString();
const Core::FeatureSet preferred = Core::FeatureSet::fromStringList(wiz->value(QLatin1String("PreferredFeatures")).toStringList()); const Core::FeatureSet preferred = Core::FeatureSet::fromStringList(wiz->value(QLatin1String("PreferredFeatures")).toStringList());
const Core::FeatureSet required = Core::FeatureSet::fromStringList(wiz->value(QLatin1String("RequiredFeatures")).toStringList()); const Core::FeatureSet required = Core::FeatureSet::fromStringList(wiz->value(QLatin1String("RequiredFeatures")).toStringList());
const QString path = wiz->expander()->expand(m_projectFilePath);
setProjectPath(path);
setRequiredKitMatcher(KitMatcher([required](const Kit *k) { return k->hasFeatures(required); })); setRequiredKitMatcher(KitMatcher([required](const Kit *k) { return k->hasFeatures(required); }));
setPreferredKitMatcher(KitMatcher([platform, preferred](const Kit *k) { return k->hasPlatform(platform) && k->hasFeatures(preferred); })); setPreferredKitMatcher(KitMatcher([platform, preferred](const Kit *k) { return k->hasPlatform(platform) && k->hasFeatures(preferred); }));
setProjectPath(wiz->expander()->expand(unexpandedProjectPath()));
TargetSetupPage::initializePage(); TargetSetupPage::initializePage();
} }

7
src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
View File

@@ -44,16 +44,17 @@ class JsonKitsPage : public TargetSetupPage
public: public:
JsonKitsPage(QWidget *parent = 0); JsonKitsPage(QWidget *parent = 0);
void setProjectFilePath(const QString &path) { m_projectFilePath = path; }
void initializePage(); void initializePage();
void cleanupPage(); void cleanupPage();
void setUnexpandedProjectPath(const QString &path);
QString unexpandedProjectPath() const;
private slots: private slots:
void setupProjectFiles(const JsonWizard::GeneratorFiles &files); void setupProjectFiles(const JsonWizard::GeneratorFiles &files);
private: private:
QString m_projectFilePath; QString m_unexpandedProjectPath;
}; };
} // namespace ProjectExplorer } // namespace ProjectExplorer

2
src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
View File

@@ -139,7 +139,7 @@ Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Core::Id typeId,
QTC_ASSERT(canCreate(typeId), return 0); QTC_ASSERT(canCreate(typeId), return 0);
JsonKitsPage *page = new JsonKitsPage; JsonKitsPage *page = new JsonKitsPage;
page->setProjectFilePath(data.toMap().value(QLatin1String("projectFilePath")).toString()); page->setUnexpandedProjectPath(data.toMap().value(QLatin1String("projectFilePath")).toString());
return page; return page;
} }