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. One API adaptation was required in
QbsProjectManager.

Change-Id: I59dd76ffa0381d13b4d5f4b4609e85cf73ab32c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2017-06-14 12:06:56 +02:00
parent 6036739e0c
commit aedcccd78f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
params.setBuildRoot(dir); params.setBuildRoot(dir);
params.setProjectFilePath(m_projectFilePath); params.setProjectFilePath(m_projectFilePath);
params.setIgnoreDifferentProjectFilePath(false); params.setOverrideBuildGraphData(true);
params.setEnvironment(env.toProcessEnvironment()); params.setEnvironment(env.toProcessEnvironment());
const qbs::Preferences prefs(QbsManager::settings(), profileName); const qbs::Preferences prefs(QbsManager::settings(), profileName);
params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory())); params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory()));

2
src/shared/qbs

Submodule src/shared/qbs updated: 7ccc08f331...bf851f8a42