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

Qbs: Fix build

Browse Source 
Change-Id: I284f814ac63eb489a6b0a39dce85008de742237a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-02-01 13:41:29 +01:00
parent 87a78cddff
commit 44c9cd8fe2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,9 +382,14 @@ void QbsProject::parse(const QVariantMap &config, const QString &dir)
m_qbsBuildRoot = dir;
QTC_ASSERT(!m_qbsSetupProjectJob, return);
qbs::SetupProjectParameters params;
params.buildConfiguration = m_qbsBuildConfig;
params.buildRoot = m_qbsBuildRoot;
params.projectFilePath = m_fileName;
params.ignoreDifferentProjectFilePath = false;
m_qbsSetupProjectJob
= qbs::Project::setupProject(m_fileName, m_qbsBuildConfig, m_qbsBuildRoot,
m_manager->settings(), 0);
= qbs::Project::setupProject(params, m_manager->settings(), 0);
connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)),
this, SLOT(handleQbsParsingDone(bool)));