From aedcccd78f837b39f42c6fa1b0e823124345636d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 14 Jun 2017 12:06:56 +0200 Subject: [PATCH] Update qbs submodule To HEAD of master branch. One API adaptation was required in QbsProjectManager. Change-Id: I59dd76ffa0381d13b4d5f4b4609e85cf73ab32c5 Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsprojectparser.cpp | 2 +- src/shared/qbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp index fa5c10b4219..b742eb060e2 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp @@ -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())); diff --git a/src/shared/qbs b/src/shared/qbs index 7ccc08f3315..bf851f8a42b 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 7ccc08f33153cd3093081567ac653e371759d69a +Subproject commit bf851f8a42b27d2a1fa9d384be18407ef9344250