forked from qt-creator/qt-creator
Re-enable 'Run as Root'
Accidentally dropped in b05fc053ef
.
Change-Id: I4cc9da1057ae9e19d3efd3b1d9482b18b7d847df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -1216,6 +1216,10 @@ void SimpleTargetRunner::doStart(const Runnable &runnable)
|
||||
if (auto runAsRootAspect = runControl()->aspect<RunAsRootAspect>())
|
||||
runAsRoot = runAsRootAspect->value;
|
||||
|
||||
Environment env = runnable.environment;
|
||||
if (runAsRoot)
|
||||
RunControl::provideAskPassEntry(env);
|
||||
|
||||
m_stopForced = false;
|
||||
m_stopReported = false;
|
||||
m_launcher.disconnect(this);
|
||||
@@ -1225,7 +1229,7 @@ void SimpleTargetRunner::doStart(const Runnable &runnable)
|
||||
|
||||
m_launcher.setCommand(runnable.command);
|
||||
m_launcher.setWorkingDirectory(runnable.workingDirectory);
|
||||
m_launcher.setEnvironment(runnable.environment);
|
||||
m_launcher.setEnvironment(env);
|
||||
m_launcher.setExtraData(runnable.extraData);
|
||||
|
||||
const QString msg = RunControl::tr("Starting %1...").arg(runnable.command.toUserOutput());
|
||||
|
Reference in New Issue
Block a user