diff options
| author | Tobias Hunger <[email protected]> | 2016-04-29 16:52:58 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2016-05-11 10:04:38 +0000 |
| commit | ddefe062c73e35def585f8fc6c90a4f18e47c0f4 (patch) | |
| tree | 03c3aecc501c03b92e259fe0ae1c4d472033b7e5 /src/plugins/debugger/debuggersourcepathmappingwidget.cpp | |
| parent | 1a248b1b932e2c7c42e25993d921e78c52aa4bcf (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggersourcepathmappingwidget.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggersourcepathmappingwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 4769eecf3a3..11319c47c97 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -415,7 +415,7 @@ static QString findQtInstallPath(const FileName &qmakePath) return QString(); } proc.closeWriteChannel(); - if (!proc.waitForFinished()) { + if (!proc.waitForFinished() && proc.state() == QProcess::Running) { SynchronousProcess::stopProcess(proc); qWarning("%s: Timeout running '%s'.", Q_FUNC_INFO, qPrintable(qmakePath.toString())); return QString(); |