Update qbs submodule.

And adapt to API change.

Task-number: QBS-952
Change-Id: I668d6830187f7954e7391f09ff8522422fd0d44d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2016-04-07 11:08:12 +02:00
parent e9b1e493c2
commit e6a64d40ef
2 changed files with 8 additions and 2 deletions

View File

@@ -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())