From 44c9cd8fe2088065d6a0dfab109d9c4820c51d2d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 1 Feb 2013 13:41:29 +0100 Subject: [PATCH] Qbs: Fix build Change-Id: I284f814ac63eb489a6b0a39dce85008de742237a Reviewed-by: Tobias Hunger --- src/plugins/qbsprojectmanager/qbsproject.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 588ee3a60c..d4994be4ec 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -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))); -- GitLab