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

fixup comments in SynchronousProcess::run*()

Browse Source 
one instance had drifted away from its relevant location, while another
instance was a bogus c&p.

Change-Id: I0148f08ca2741efd82bf10a042fe341bafcfc087
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Oswald Buddenhagen
2020-12-09 18:50:53 +01:00
parent 1981d90f39
commit ef3821c6b9
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/synchronousprocess.cpp
View File

@@ -475,9 +475,6 @@ SynchronousProcessResponse SynchronousProcess::run(const CommandLine &cmd,
d->clearForRun();
// On Windows, start failure is triggered immediately if the
// executable cannot be found in the path. Do not start the
// event loop in that case.
d->m_binary = cmd.executable();
// using QProcess::start() and passing program, args and OpenMode results in a different
// quoting of arguments than using QProcess::setArguments() beforehand and calling start()
@@ -499,6 +496,9 @@ SynchronousProcessResponse SynchronousProcess::run(const CommandLine &cmd,
});
d->m_process.start(writeData.isEmpty() ? QIODevice::ReadOnly : QIODevice::ReadWrite);
// On Windows, start failure is triggered immediately if the
// executable cannot be found in the path. Do not start the
// event loop in that case.
if (!d->m_startFailure) {
d->m_timer.start();
if (isGuiThread())
@@ -529,9 +529,6 @@ SynchronousProcessResponse SynchronousProcess::runBlocking(const CommandLine &cm
d->clearForRun();
// On Windows, start failure is triggered immediately if the
// executable cannot be found in the path. Do not start the
// event loop in that case.
d->m_binary = cmd.executable();
d->m_process.start(cmd.executable().toString(), cmd.splitArguments(), QIODevice::ReadOnly);
if (!d->m_process.waitForStarted(d->m_maxHangTimerCount * 1000)