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

Synchronous process: Show binary in message box for Qt 5.

Browse Source 
Change-Id: I74b1c568593eea92f52565221789224d7d0090eb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Friedemann Kleint
2013-02-20 16:06:03 +01:00
parent 9dd3a14f28
commit 747ba7f935
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,7 +580,11 @@ bool SynchronousProcess::readDataFromProcess(QProcess &p, int timeOutMS,
// Prompt user, pretend we have data if says 'No'. // Prompt user, pretend we have data if says 'No'.
const bool hang = !hasData && !finished; const bool hang = !hasData && !finished;
if (hang && showTimeOutMessageBox) { if (hang && showTimeOutMessageBox) {
if (!askToKill()) QString binary;
#if QT_VERSION >= 0x050000
binary = p.program();
#endif
if (!askToKill(binary))
hasData = true; hasData = true;
} }
} while (hasData && !finished); } while (hasData && !finished);