Commit aedcccd7 authored by Christian Kandeler's avatar Christian Kandeler

Update qbs submodule

To HEAD of master branch. One API adaptation was required in
QbsProjectManager.

Change-Id: I59dd76ffa0381d13b4d5f4b4609e85cf73ab32c5
Reviewed-by: Joerg Bornemann's avatarJoerg Bornemann <joerg.bornemann@qt.io>
parent 6036739e
......@@ -100,7 +100,7 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
params.setBuildRoot(dir);
params.setProjectFilePath(m_projectFilePath);
params.setIgnoreDifferentProjectFilePath(false);
params.setOverrideBuildGraphData(true);
params.setEnvironment(env.toProcessEnvironment());
const qbs::Preferences prefs(QbsManager::settings(), profileName);
params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory()));
......
Subproject commit 7ccc08f33153cd3093081567ac653e371759d69a
Subproject commit bf851f8a42b27d2a1fa9d384be18407ef9344250
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