Revert "Utils: Replace SynchronousCommand::flags by a named bool"

This reverts commit c617632e4d9291f1b50ec0c7e1a914a6a689284e.

To early, dependencies missing.

Change-Id: I91433aebbaf2c04cbb212585deb3cde5f3208974
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2021-05-07 10:25:38 +02:00
parent 9a7a0098a3
commit 635993fbdc
8 changed files with 37 additions and 21 deletions

View File

@@ -103,7 +103,6 @@ public:
bool m_progressiveOutput = false;
bool m_hadOutput = false;
bool m_aborted = false;
bool m_disableUnixTerminal = false;
};
ShellCommandPrivate::Job::Job(const QString &wd, const CommandLine &command,
@@ -225,6 +224,11 @@ void ShellCommand::cancel()
emit terminate();
}
unsigned ShellCommand::processFlags() const
{
return 0;
}
void ShellCommand::addTask(QFuture<void> &future)
{
Q_UNUSED(future)
@@ -353,8 +357,7 @@ SynchronousProcessResponse ShellCommand::runFullySynchronous(const CommandLine &
{
// Set up process
SynchronousProcess process;
if (d->m_disableUnixTerminal)
process.setDisableUnixTerminal();
process.setFlags(processFlags());
const QString dir = workDirectory(workingDirectory);
if (!dir.isEmpty())
process.setWorkingDirectory(dir);
@@ -398,8 +401,7 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const CommandLine &cmd,
process.setTimeoutS(timeoutS);
if (d->m_codec)
process.setCodec(d->m_codec);
if (d->m_disableUnixTerminal)
process.setDisableUnixTerminal();
process.setFlags(processFlags());
const QString dir = workDirectory(workingDirectory);
if (!dir.isEmpty())
process.setWorkingDirectory(dir);
@@ -487,11 +489,6 @@ void ShellCommand::setOutputProxyFactory(const std::function<OutputProxy *()> &f
d->m_proxyFactory = factory;
}
void ShellCommand::setDisableUnixTerminal()
{
d->m_disableUnixTerminal = true;
}
ProgressParser::ProgressParser() :
m_futureMutex(new QMutex)
{ }