diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-12-09 12:56:14 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2021-02-08 16:23:25 +0000 |
| commit | fa6d825c5f241a2da9e417e30debc92068c5e3a5 (patch) | |
| tree | 512d2ef65d2e6af07cf1ec1718e259eeabf283b3 /src/plugins/ios | |
| parent | a673fca1445a0f34b6799d9d60e521c8ae9b68af (diff) | |
remove pointless process state checking
this partially reverts ddefe062c7 - contrary to what that commit's
message suggests, the process state doesn't just change out of the blue,
making waitForFinished() return false. that requires the process being
reaped, which may happen only if the event loop runs or one of the
I/O-related waitFor*() functions is called on that process.
note that the first condition in SynchronousProcess::stopProcess() was
actually bogus, as it makes obviously no sense whatsoever to insist that
the process is still running after waitForFinished() returned success.
qtpromaker was also plain broken - it would always terminate prematurely
due to thinking that the sub-process failed.
Change-Id: I44f332a6784ccc7e732ee868e38218f746141129
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/ios')
| -rw-r--r-- | src/plugins/ios/iossimulator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp index 1cf87a69157..7dbee85a200 100644 --- a/src/plugins/ios/iossimulator.cpp +++ b/src/plugins/ios/iossimulator.cpp @@ -88,7 +88,7 @@ Utils::Port IosSimulator::nextPort() const if (!portVerifier.waitForStarted()) break; portVerifier.closeWriteChannel(); - if (!portVerifier.waitForFinished() && portVerifier.state() == QProcess::Running) + if (!portVerifier.waitForFinished()) break; if (portVerifier.exitStatus() != QProcess::NormalExit || portVerifier.exitCode() != 0) |