From 691c8148a3bf29fda53655fe3423fd18a0704d93 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 20 Jun 2023 09:27:47 +0200
Subject: [PATCH] ProjectExplorer/RemoteLinux: Consolidate X11ForwardingAspect
 handling

Change-Id: I7e74f58ab50c84c74ba65f9f64aaa4d0ea73bbb6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/projectexplorer/runconfiguration.cpp             | 2 ++
 src/plugins/python/pythonrunconfiguration.cpp                | 5 -----
 src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 2 --
 .../remotelinux/remotelinuxcustomrunconfiguration.cpp        | 5 -----
 src/plugins/remotelinux/remotelinuxrunconfiguration.cpp      | 5 -----
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index a38b8dfae05..452d07c3599 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -403,6 +403,8 @@ Runnable RunConfiguration::runnable() const
         r.workingDirectory = r.command.executable().withNewMappedPath(workingDirectoryAspect->workingDirectory());
     if (auto environmentAspect = aspect<EnvironmentAspect>())
         r.environment = environmentAspect->environment();
+    if (auto forwardingAspect = aspect<X11ForwardingAspect>())
+        r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display());
     if (m_runnableModifier)
         m_runnableModifier(r);
     return r;
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index 998a829bc91..a2ed429adbe 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -200,11 +200,6 @@ PythonRunConfiguration::PythonRunConfiguration(Target *target, Id id)
     if (HostOsInfo::isAnyUnixHost())
         addAspect<X11ForwardingAspect>(macroExpander());
 
-    setRunnableModifier([this](Runnable &r) {
-        if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>())
-            r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display());
-    });
-
     setCommandLineGetter([bufferedAspect, interpreterAspect, argumentsAspect, scriptAspect] {
         CommandLine cmd{interpreterAspect->currentInterpreter().command};
         if (!bufferedAspect->value())
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index e2626402f60..9e9a29d35d1 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -171,8 +171,6 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
     setRunnableModifier([this](Runnable &r) {
         const QmlBuildSystem *bs = static_cast<QmlBuildSystem *>(activeBuildSystem());
         r.workingDirectory = bs->targetDirectory();
-        if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>())
-            r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display());
     });
 
     setDisplayName(Tr::tr("QML Utility", "QMLRunConfiguration display name."));
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index fd6f75c0761..9b99d66923b 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -52,11 +52,6 @@ RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *tar
     if (HostOsInfo::isAnyUnixHost())
         addAspect<X11ForwardingAspect>(macroExpander());
 
-    setRunnableModifier([this](Runnable &r) {
-        if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>())
-            r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display());
-    });
-
     setDefaultDisplayName(runConfigDefaultDisplayName());
 }
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 42e80aae41b..4ac92d237e2 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -73,11 +73,6 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Id id)
         libAspect->setEnabled(buildDevice == runDevice);
     });
 
-    setRunnableModifier([this](Runnable &r) {
-        if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>())
-            r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display());
-    });
-
     envAspect->addModifier([this, libAspect](Environment &env) {
         BuildTargetInfo bti = buildTargetInfo();
         if (bti.runEnvModifier)