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

Update qbs submodule.

Browse Source 
To HEAD of master branch. Also adapt QbsProjectManager to API changes.

Change-Id: I22eb0c0966685fc26a3c6c143fd3d2d5cb4fab8d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Christian Kandeler
2014-06-20 14:28:41 +02:00
parent 71df641046
commit 8327171002
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,16 +84,15 @@ bool QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
m_currentProgressBase = 0; m_currentProgressBase = 0;
qbs::SetupProjectParameters params; qbs::SetupProjectParameters params;
QVariantMap baseConfig;
QVariantMap userConfig = config; QVariantMap userConfig = config;
QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY); QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY);
const QString profileName = userConfig.take(specialKey).toString(); const QString profileName = userConfig.take(specialKey).toString();
baseConfig.insert(specialKey, profileName); params.setTopLevelProfile(profileName);
specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY); specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
baseConfig.insert(specialKey, userConfig.take(specialKey)); params.setBuildVariant(userConfig.take(specialKey).toString());
params.setBuildConfiguration(baseConfig); params.setSettingsDirectory(QbsManager::settings()->baseDirectoy());
params.setOverriddenValues(userConfig); params.setOverriddenValues(userConfig);
m_error = params.expandBuildConfiguration(QbsManager::settings()); m_error = params.expandBuildConfiguration();
if (m_error.hasError()) { if (m_error.hasError()) {
emit done(false); emit done(false);
return false; return false;

2
src/shared/qbs

Submodule src/shared/qbs updated: 243964aae9...6d72bca8f8