Commit 3c7af784 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

QbsProjectManager: Fix overriding of properties.



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

Change-Id: I3bcb013fde2b76521a85c3283e2b158beaf40b26
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 9aea8087
......@@ -416,7 +416,14 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
QTC_ASSERT(!dir.isNull(), return);
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());
if (err.hasError()) {
generateErrors(err);
......
Markdown is supported
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