feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Re-enable 'Run as Root'

Browse Source 
Accidentally dropped in b05fc053ef.

Change-Id: I4cc9da1057ae9e19d3efd3b1d9482b18b7d847df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-05-23 10:36:22 +02:00
parent 646254f460
commit f4b7faff18
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -1216,6 +1216,10 @@ void SimpleTargetRunner::doStart(const Runnable &runnable)
if (auto runAsRootAspect = runControl()->aspect<RunAsRootAspect>()) if (auto runAsRootAspect = runControl()->aspect<RunAsRootAspect>())
runAsRoot = runAsRootAspect->value; runAsRoot = runAsRootAspect->value;
Environment env = runnable.environment;
if (runAsRoot)
RunControl::provideAskPassEntry(env);
m_stopForced = false; m_stopForced = false;
m_stopReported = false; m_stopReported = false;
m_launcher.disconnect(this); m_launcher.disconnect(this);
@@ -1225,7 +1229,7 @@ void SimpleTargetRunner::doStart(const Runnable &runnable)
m_launcher.setCommand(runnable.command); m_launcher.setCommand(runnable.command);
m_launcher.setWorkingDirectory(runnable.workingDirectory); m_launcher.setWorkingDirectory(runnable.workingDirectory);
m_launcher.setEnvironment(runnable.environment); m_launcher.setEnvironment(env);
m_launcher.setExtraData(runnable.extraData); m_launcher.setExtraData(runnable.extraData);
const QString msg = RunControl::tr("Starting %1...").arg(runnable.command.toUserOutput()); const QString msg = RunControl::tr("Starting %1...").arg(runnable.command.toUserOutput());