forked from qt-creator/qt-creator
Update qbs submodule.
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:
@@ -84,16 +84,15 @@ bool QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
|
||||
m_currentProgressBase = 0;
|
||||
|
||||
qbs::SetupProjectParameters params;
|
||||
QVariantMap baseConfig;
|
||||
QVariantMap userConfig = config;
|
||||
QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY);
|
||||
const QString profileName = userConfig.take(specialKey).toString();
|
||||
baseConfig.insert(specialKey, profileName);
|
||||
params.setTopLevelProfile(profileName);
|
||||
specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
|
||||
baseConfig.insert(specialKey, userConfig.take(specialKey));
|
||||
params.setBuildConfiguration(baseConfig);
|
||||
params.setBuildVariant(userConfig.take(specialKey).toString());
|
||||
params.setSettingsDirectory(QbsManager::settings()->baseDirectoy());
|
||||
params.setOverriddenValues(userConfig);
|
||||
m_error = params.expandBuildConfiguration(QbsManager::settings());
|
||||
m_error = params.expandBuildConfiguration();
|
||||
if (m_error.hasError()) {
|
||||
emit done(false);
|
||||
return false;
|
||||
|
Submodule src/shared/qbs updated: 243964aae9...6d72bca8f8
Reference in New Issue
Block a user