diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-04-29 16:52:58 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-05-11 10:04:38 +0000 |
| commit | ddefe062c73e35def585f8fc6c90a4f18e47c0f4 (patch) | |
| tree | 03c3aecc501c03b92e259fe0ae1c4d472033b7e5 /src/plugins/ios/iossimulator.cpp | |
| parent | 1a248b1b932e2c7c42e25993d921e78c52aa4bcf (diff) | |
| download | qt-creator-ddefe062c73e35def585f8fc6c90a4f18e47c0f4.tar.gz | |
Fix up QProcess::waitForFinished()
waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.
Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/ios/iossimulator.cpp')
| -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 9494b356bc..a5c0bf3965 100644 --- a/src/plugins/ios/iossimulator.cpp +++ b/src/plugins/ios/iossimulator.cpp @@ -187,7 +187,7 @@ Utils::Port IosSimulator::nextPort() const if (!portVerifier.waitForStarted()) break; portVerifier.closeWriteChannel(); - if (!portVerifier.waitForFinished()) + if (!portVerifier.waitForFinished() && portVerifier.state() == QProcess::Running) break; if (portVerifier.exitStatus() != QProcess::NormalExit || portVerifier.exitCode() != 0) |