From b9b3717007312a5bb4dcfd70e3205f706d3a19cb Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 15 May 2017 16:15:08 +0200
Subject: [PATCH] RemoteLinux: Fix creation of environment aspect widget

This was forgotten in ae9fff17a1.

Task-number: QTCREATORBUG-18167
Change-Id: Ib1e3d06ee822dff6b991d967b2f68148cc9c55c6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp | 9 +++------
 src/plugins/remotelinux/remotelinuxenvironmentaspect.h   | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index 41432ba29bf..d821945a13e 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -35,18 +35,15 @@ namespace RemoteLinux {
 
 RemoteLinuxEnvironmentAspect::RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :
     ProjectExplorer::EnvironmentAspect(rc)
-{ }
+{
+    setRunConfigWidgetCreator([this] { return new RemoteLinuxEnvironmentAspectWidget(this); });
+}
 
 RemoteLinuxEnvironmentAspect *RemoteLinuxEnvironmentAspect::create(ProjectExplorer::RunConfiguration *parent) const
 {
     return new RemoteLinuxEnvironmentAspect(parent);
 }
 
-ProjectExplorer::RunConfigWidget *RemoteLinuxEnvironmentAspect::createConfigurationWidget()
-{
-    return new RemoteLinuxEnvironmentAspectWidget(this);
-}
-
 QList<int> RemoteLinuxEnvironmentAspect::possibleBaseEnvironments() const
 {
     return QList<int>() << static_cast<int>(RemoteBaseEnvironment)
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
index 02a4cbf1191..8491eef4b6b 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
@@ -30,7 +30,6 @@
 #include <projectexplorer/environmentaspect.h>
 
 namespace RemoteLinux {
-class RemoteLinuxEnvironmentAspectWidget;
 
 class REMOTELINUX_EXPORT RemoteLinuxEnvironmentAspect : public ProjectExplorer::EnvironmentAspect
 {
@@ -39,7 +38,6 @@ class REMOTELINUX_EXPORT RemoteLinuxEnvironmentAspect : public ProjectExplorer::
 public:
     RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc);
     RemoteLinuxEnvironmentAspect *create(ProjectExplorer::RunConfiguration *parent) const;
-    ProjectExplorer::RunConfigWidget *createConfigurationWidget();
 
     QList<int> possibleBaseEnvironments() const;
     QString baseEnvironmentDisplayName(int base) const;