diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp index 89cf5b60396..eca30dc283c 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp @@ -47,16 +47,16 @@ Environment QmlProjectEnvironmentAspect::baseEnvironment() const ? Environment::systemEnvironment() : Environment(); - if (QmlProject *project = qobject_cast(runConfiguration()->target()->project())) + if (QmlProject *project = qobject_cast(m_target->project())) env.modify(project->environment()); return env; } -QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(RunConfiguration *rc) - : EnvironmentAspect(rc) +QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(RunConfiguration *rc, Target *target) + : EnvironmentAspect(rc), m_target(target) { - if (DeviceTypeKitInformation::deviceTypeId(runConfiguration()->target()->kit()) + if (DeviceTypeKitInformation::deviceTypeId(target->kit()) == Constants::DESKTOP_DEVICE_TYPE) addPreferredBaseEnvironment(SystemEnvironmentBase, tr("System Environment")); diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h index 97a49c4b301..2d455ee10bf 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h @@ -34,9 +34,13 @@ class QmlProjectEnvironmentAspect : public ProjectExplorer::EnvironmentAspect Q_OBJECT public: - QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc); + QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc, + ProjectExplorer::Target *target); Utils::Environment baseEnvironment() const override; + +private: + ProjectExplorer::Target *m_target; }; } // namespace QmlProjectManager diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 0ee9a2877ff..adc4e961691 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -281,7 +281,7 @@ void MainQmlFileAspect::changeCurrentFile(IEditor *editor) QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) : RunConfiguration(target, id) { - addAspect(); + addAspect(target); m_qmlViewerAspect = addAspect(); m_qmlViewerAspect->setLabelText(tr("QML viewer:")); m_qmlViewerAspect->setPlaceHolderText(executable());