Commit e6a64d40 authored by Christian Kandeler's avatar Christian Kandeler

Update qbs submodule.

And adapt to API change.

Task-number: QBS-952
Change-Id: I668d6830187f7954e7391f09ff8522422fd0d44d
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
parent e9b1e493
......@@ -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())
......
Subproject commit ed37fd99438a2053d18b31ecd2366305bbc3ae03
Subproject commit bc5ef731d64edd6d2f152a7c68b6ad46efd7066c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment