From e6a64d40ef66f1a66e195d5763a58eed09ce385c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Thu, 7 Apr 2016 11:08:12 +0200
Subject: [PATCH] Update qbs submodule.

And adapt to API change.

Task-number: QBS-952
Change-Id: I668d6830187f7954e7391f09ff8522422fd0d44d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 8 +++++++-
 src/shared/qbs                                        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index 68b468a0eff..8a028278037 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -30,6 +30,7 @@
 #include "qbsproject.h"
 
 #include <coreplugin/coreicons.h>
+#include <coreplugin/messagemanager.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/buildsteplist.h>
@@ -276,7 +277,12 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
             procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable());
             qbs::RunEnvironment qbsRunEnv = project->qbsProject().getRunEnvironment(product, installOptions(),
                     procEnv, QbsManager::settings());
-            procEnv = qbsRunEnv.runEnvironment();
+            qbs::ErrorInfo error;
+            procEnv = qbsRunEnv.runEnvironment(&error);
+            if (error.hasError()) {
+                Core::MessageManager::write(tr("Error retrieving run environment: %1")
+                                            .arg(error.toString()));
+            }
             if (!procEnv.isEmpty()) {
                 env = Utils::Environment();
                 foreach (const QString &key, procEnv.keys())
diff --git a/src/shared/qbs b/src/shared/qbs
index ed37fd99438..bc5ef731d64 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit ed37fd99438a2053d18b31ecd2366305bbc3ae03
+Subproject commit bc5ef731d64edd6d2f152a7c68b6ad46efd7066c