diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-10 14:44:17 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-13 10:47:08 +0000 |
| commit | 7719fb669cc522e2b1846b05e22fb1d0a6317963 (patch) | |
| tree | cf1edd663f9b65dc21eb523573be9ce7a0a26a39 /src/plugins/mercurial | |
| parent | a55fb4a378644ab641f0663c8f2577f48a905491 (diff) | |
Vcs: Standardize on second based timeouts
Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/mercurial')
| -rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 7ca29f347f..82ed3dc995 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -159,7 +159,7 @@ bool MercurialClient::synchronousPull(const QString &workingDir, const QString & QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert(QLatin1String("LANGUAGE"), QLatin1String("C")); const SynchronousProcessResponse resp = VcsBasePlugin::runVcs( - workingDir, vcsBinary(), args, vcsTimeout() * 1000, flags, 0, env); + workingDir, vcsBinary(), args, vcsTimeoutS(), flags, 0, env); const bool ok = resp.result == SynchronousProcessResponse::Finished; parsePullOutput(resp.stdOut.trimmed()); |