diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-04-14 22:30:46 +0300 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-15 12:42:46 +0000 |
| commit | a79df8e1e78384745e68d365b23cc77656c060aa (patch) | |
| tree | c81b132422e64525827696cf574ce4520c440c56 /src/plugins/coreplugin/patchtool.cpp | |
| parent | 5a2b5036abdfb9131acd7e4618e2d8e13d487d63 (diff) | |
| download | qt-creator-a79df8e1e78384745e68d365b23cc77656c060aa.tar.gz | |
Utils: Make SynchronousProcess use second based timeouts
Change-Id: Ie2de2359225017cae7181bee0df17542fa36efd8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/patchtool.cpp')
| -rw-r--r-- | src/plugins/coreplugin/patchtool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index f57a586544..098575b325 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -111,7 +111,7 @@ bool PatchTool::runPatch(const QByteArray &input, const QString &workingDirector patchProcess.closeWriteChannel(); QByteArray stdOut; QByteArray stdErr; - if (!Utils::SynchronousProcess::readDataFromProcess(patchProcess, 30000, &stdOut, &stdErr, true)) { + if (!Utils::SynchronousProcess::readDataFromProcess(patchProcess, 30, &stdOut, &stdErr, true)) { Utils::SynchronousProcess::stopProcess(patchProcess); MessageManager::write(QApplication::translate("Core::PatchTool", "A timeout occurred running \"%1\"").arg(patch)); return false; |