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

Use "timeout" consistently

Browse Source 
Change-Id: Ic4e2ba6269bd61eb2fa2bbef1e1c24c05f91e6a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Robert Loehning
2016-04-20 12:54:12 +02:00
parent f32a1b1e4c
commit 0eeee15a88
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -96,7 +96,7 @@ FormatTask format(FormatTask task)
process.start(executable, options); process.start(executable, options);
if (!process.waitForFinished(5000)) { if (!process.waitForFinished(5000)) {
process.kill(); process.kill();
task.error = QObject::tr("Cannot call %1 or some other error occurred. Time out " task.error = QObject::tr("Cannot call %1 or some other error occurred. Timeout "
"reached while formatting file %2.") "reached while formatting file %2.")
.arg(executable).arg(task.filePath); .arg(executable).arg(task.filePath);
return task; return task;
@@ -131,7 +131,7 @@ FormatTask format(FormatTask task)
process.closeWriteChannel(); process.closeWriteChannel();
if (!process.waitForFinished(5000)) { if (!process.waitForFinished(5000)) {
process.kill(); process.kill();
task.error = QObject::tr("Cannot call %1 or some other error occurred. Time out " task.error = QObject::tr("Cannot call %1 or some other error occurred. Timeout "
"reached while formatting file %2.") "reached while formatting file %2.")
.arg(executable).arg(task.filePath); .arg(executable).arg(task.filePath);
return task; return task;