diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-06-16 14:32:59 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-06-17 13:58:03 +0200 |
| commit | e07ea93d894ed847d835ff478fb29f42474bfa9a (patch) | |
| tree | cb0eef5441a396b5d87eea9be78a1cf950ecfff8 /src/plugins/qbsprojectmanager/qbsproject.cpp | |
| parent | 42dc63eacdb90292f4c284c1f8acb55a1c8e0b32 (diff) | |
| download | qt-creator-e07ea93d894ed847d835ff478fb29f42474bfa9a.tar.gz | |
Qbs: Simplify qbsmanager
Change-Id: I6755e28e1f75788203a0e734cd1b6dabd2308919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsproject.cpp')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 05c6daaa3f..9016e3b881 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -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))); |