From 409f9c47e516eda4ddffdb029464ed707f4100a9 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 18 Feb 2014 15:12:41 +0100
Subject: [PATCH] Update qbs submodule.
And make sure we re-fetch project data after building, as now qbs can
find new target artifacts while building.
Change-Id: I880689c33893b599686919a90f04281e36c3935e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 3 +++
src/shared/qbs | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 7bc8970c353..678e4f15f04 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -239,6 +239,9 @@ void QbsBuildStep::buildingDone(bool success)
createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
item.codeLocation().fileName(), item.codeLocation().line());
+ // Building can uncover additional target artifacts.
+ static_cast<QbsProject *>(project())->parseCurrentBuildConfiguration(true);
+
QTC_ASSERT(m_fi, return);
m_fi->reportResult(success);
m_fi = 0; // do not delete, it is not ours
diff --git a/src/shared/qbs b/src/shared/qbs
index f64c7492a3b..6f6606b798b 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit f64c7492a3ba5cd73994be810be7ff529a19f37e
+Subproject commit 6f6606b798b2e9c3911b2a0794835089ab100cb8
--
GitLab