diff options
author | hjk <hjk@qt.io> | 2019-04-05 16:45:53 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-04-05 15:10:44 +0000 |
commit | d34eb692fefbeaf6080ffbc150ea4d9b414420f7 (patch) | |
tree | 9c1d8eb2664808d87987632b308a08f513924452 /src/plugins/qmlprojectmanager | |
parent | 2430168322f9046372fb92ecd177f5b6809d5eb1 (diff) |
QmlProject: Do not crash on project creation
Task-number: QTCREATORBUG-22244
Change-Id: I38c6527269ba553c0e4734c437f5a6918da729a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 412cbb94c7..2513076901 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -281,7 +281,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) { auto envAspect = addAspect<EnvironmentAspect>(); - auto envModifier = [&](Environment env) { + auto envModifier = [target](Environment env) { if (auto project = qobject_cast<const QmlProject *>(target->project())) env.modify(project->environment()); return env; @@ -289,12 +289,12 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) const Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target->kit()); if (deviceTypeId == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { - envAspect->addPreferredBaseEnvironment(tr("System Environment"), [&] { + envAspect->addPreferredBaseEnvironment(tr("System Environment"), [envModifier] { return envModifier(Environment::systemEnvironment()); }); } - envAspect->addSupportedBaseEnvironment(tr("Clean Environment"), [&] { + envAspect->addSupportedBaseEnvironment(tr("Clean Environment"), [envModifier] { return envModifier(Environment()); }); |