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

Qbs: Simplify qbsmanager

Browse Source 
Change-Id: I6755e28e1f75788203a0e734cd1b6dabd2308919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-06-16 14:32:59 +02:00
parent 42dc63eacd
commit e07ea93d89
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -437,7 +437,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
baseConfig.insert(specialKey, userConfig.take(specialKey));
params.setBuildConfiguration(baseConfig);
params.setOverriddenValues(userConfig);
qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
qbs::ErrorInfo err = params.expandBuildConfiguration(QbsManager::settings());
if (err.hasError()) {
generateErrors(err);
return;
@@ -478,7 +478,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
QTC_ASSERT(!m_qbsSetupProjectJob, return);
m_qbsSetupProjectJob
= qbs::Project::setupProject(params, m_manager->logSink(), 0);
= qbs::Project::setupProject(params, QbsManager::logSink(), 0);
connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)),
this, SLOT(handleQbsParsingDone(bool)));