From 2845427d4620a1de7bbe27162284cd5c99f5f21d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 16 Feb 2021 12:42:59 +0100
Subject: [PATCH] ProjectExplorer: create provideAskPassEntry(Environment &)
 convenience

... to centrally set SUDO_ASKPASS unless present.

To be used for 'Run as root'

Change-Id: I85bac939e6a7fba0b2299fd17edfe73577bfa5ad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/runcontrol.cpp | 11 +++++++++++
 src/plugins/projectexplorer/runcontrol.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 12ab39a8c74..f31053ca8c4 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -50,6 +50,8 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
 
+#include <ssh/sshsettings.h>
+
 #include <QDir>
 #include <QFormLayout>
 #include <QHash>
@@ -1067,6 +1069,15 @@ bool RunControl::showPromptToStopDialog(const QString &title,
     return close;
 }
 
+void RunControl::provideAskPassEntry(Environment &env)
+{
+    if (env.value("SUDO_ASKPASS").isEmpty()) {
+        const FilePath askpass = QSsh::SshSettings::askpassFilePath();
+        if (askpass.exists())
+            env.set("SUDO_ASKPASS", askpass.toUserOutput());
+    }
+}
+
 bool RunControlPrivate::isAllowedTransition(RunControlState from, RunControlState to)
 {
     switch (from) {
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h
index 0dfd35edf8c..03b8041246b 100644
--- a/src/plugins/projectexplorer/runcontrol.h
+++ b/src/plugins/projectexplorer/runcontrol.h
@@ -250,6 +250,8 @@ public:
                                        const QString &cancelButtonText = QString(),
                                        bool *prompt = nullptr);
 
+    static void provideAskPassEntry(Utils::Environment &env);
+
     RunWorker *createWorker(Utils::Id workerId);
 
     bool createMainWorker();