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

QbsProjectManager: Fix overriding of properties.

Browse Source 
We have to mark the user-set properties appropriately; otherwise,
properties in project files will not get overridden.

Change-Id: I3bcb013fde2b76521a85c3283e2b158beaf40b26
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Christian Kandeler
2013-10-24 15:10:04 +02:00
parent 9aea8087a1
commit 3c7af78448
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -416,7 +416,14 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
QTC_ASSERT(!dir.isNull(), return); QTC_ASSERT(!dir.isNull(), return);
qbs::SetupProjectParameters params; qbs::SetupProjectParameters params;
params.setBuildConfiguration(config); QVariantMap baseConfig;
QVariantMap userConfig = config;
QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY);
baseConfig.insert(specialKey, userConfig.take(specialKey));
specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
baseConfig.insert(specialKey, userConfig.take(specialKey));
params.setBuildConfiguration(baseConfig);
params.setOverriddenValues(userConfig);
qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings()); qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
if (err.hasError()) { if (err.hasError()) {
generateErrors(err); generateErrors(err);