From a4e55cbeda3291cbdf4ee4c27611d94d15cd7f42 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Jul 2014 18:05:41 +0200 Subject: [PATCH] Update qbs submodule. And adapt the QbsProjectManager to an API change. Change-Id: I2530c57c720a7f5e009df23d62945f7bafb9168c Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsprojectparser.cpp | 2 +- src/shared/qbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp index 171e921b16b..b43d8d4dd27 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp @@ -124,7 +124,7 @@ bool QbsProjectParser::parse(const QVariantMap &config, const Environment &env, params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory())); 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*)), this, SLOT(handleQbsParsingDone(bool))); diff --git a/src/shared/qbs b/src/shared/qbs index 3a037fe9a27..4d0a76fafeb 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 3a037fe9a274953549c52d6d41e6112daa6362ac +Subproject commit 4d0a76fafebf11af4ab948e60f9f8eae7097fca8