diff options
| author | hjk <hjk@qt.io> | 2018-09-10 13:24:54 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-09-11 07:55:33 +0000 |
| commit | 892be5a70c92c728e82603da8f02c5eb0df89f6b (patch) | |
| tree | 70cd0db80a9f94f952a073558c05ab6f8b779934 /src/plugins/remotelinux | |
| parent | ddd46e18f330f3769708dd73a9c015c66863c3b9 (diff) | |
| download | qt-creator-892be5a70c92c728e82603da8f02c5eb0df89f6b.tar.gz | |
RemoteLinux: Pass target to RemoteLinuxEnvironmentAspectWidget ctor
This avoids one use of IRunConfigurationAspect::runConfiguration()
which is meant to be removed soon.
Change-Id: I70a493a750e7e6baf9477552acd273c417d88289
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/remotelinux')
3 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp index 2ad9d3da7e..385c9f4f36 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp @@ -53,7 +53,9 @@ RemoteLinuxEnvironmentAspect::RemoteLinuxEnvironmentAspect(ProjectExplorer::RunC addSupportedBaseEnvironment(CleanBaseEnvironment, tr("Clean Environment")); addPreferredBaseEnvironment(RemoteBaseEnvironment, tr("System Environment")); - setRunConfigWidgetCreator([this] { return new RemoteLinuxEnvironmentAspectWidget(this); }); + setRunConfigWidgetCreator([this, rc] { + return new RemoteLinuxEnvironmentAspectWidget(this, rc->target()); + }); } Utils::Environment RemoteLinuxEnvironmentAspect::baseEnvironment() const diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp index dce7464e8e..4f06d741e7 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp @@ -46,11 +46,10 @@ const QString FetchEnvButtonText namespace RemoteLinux { -RemoteLinuxEnvironmentAspectWidget::RemoteLinuxEnvironmentAspectWidget(RemoteLinuxEnvironmentAspect *aspect) : +RemoteLinuxEnvironmentAspectWidget::RemoteLinuxEnvironmentAspectWidget + (RemoteLinuxEnvironmentAspect *aspect, Target *target) : EnvironmentAspectWidget(aspect, new QPushButton) { - RunConfiguration *runConfiguration = aspect->runConfiguration(); - Target *target = runConfiguration->target(); IDevice::ConstPtr device = DeviceKitInformation::device(target->kit()); deviceEnvReader = new RemoteLinuxEnvironmentReader(device, this); diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h index 77ea62166c..115b6148f9 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h @@ -40,7 +40,8 @@ class RemoteLinuxEnvironmentAspectWidget : public ProjectExplorer::EnvironmentAs Q_OBJECT public: - RemoteLinuxEnvironmentAspectWidget(RemoteLinuxEnvironmentAspect *aspect); + RemoteLinuxEnvironmentAspectWidget(RemoteLinuxEnvironmentAspect *aspect, + ProjectExplorer::Target *target); RemoteLinuxEnvironmentAspect *aspect() const; QPushButton *fetchButton() const; |