From 0eeee15a887a8180c1c28dc9f4929b066e096136 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 20 Apr 2016 12:54:12 +0200 Subject: [PATCH] Use "timeout" consistently Change-Id: Ic4e2ba6269bd61eb2fa2bbef1e1c24c05f91e6a5 Reviewed-by: Leena Miettinen --- src/plugins/beautifier/beautifierplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 2483ecc9d62..b859e3851b4 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -96,7 +96,7 @@ FormatTask format(FormatTask task) process.start(executable, options); if (!process.waitForFinished(5000)) { 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.") .arg(executable).arg(task.filePath); return task; @@ -131,7 +131,7 @@ FormatTask format(FormatTask task) process.closeWriteChannel(); if (!process.waitForFinished(5000)) { 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.") .arg(executable).arg(task.filePath); return task;