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

Update qbs submodule.

Browse Source 
And adapt the QbsProjectManager to an API change.

Change-Id: I2530c57c720a7f5e009df23d62945f7bafb9168c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-07-16 18:05:41 +02:00
parent 026a50648b
commit a4e55cbeda
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

@@ -124,7 +124,7 @@ bool QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory())); params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory()));
params.setPluginPaths(prefs.pluginPaths(pluginsBaseDirectory())); params.setPluginPaths(prefs.pluginPaths(pluginsBaseDirectory()));
m_qbsSetupProjectJob = qbs::Project::setupProject(params, QbsManager::logSink(), 0); m_qbsSetupProjectJob = m_project.setupProject(params, QbsManager::logSink(), 0);
connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)), connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)),
this, SLOT(handleQbsParsingDone(bool))); this, SLOT(handleQbsParsingDone(bool)));

2
src/shared/qbs

Submodule src/shared/qbs updated: 3a037fe9a2...4d0a76fafe