diff options
author | hjk <hjk@qt.io> | 2019-06-07 15:27:50 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-06-11 11:01:16 +0000 |
commit | 00b692e67e5fcfb4946d1da8094b05c9bf5f35ad (patch) | |
tree | 0f426c84a628cc3474b8ac85ee8a74eb04cc8fff /src/plugins/cvs | |
parent | 749eaaad81145072181a42aaf007ada71816cf3b (diff) |
Utils: Use CommandLine in ShellCommand
... and adapt users.
Change-Id: I218523ffe34720d5fe199aa0ca6892a8dc2985fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/cvs')
-rw-r--r-- | src/plugins/cvs/cvscontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 454e95df63..0a88fff266 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -151,7 +151,7 @@ Core::ShellCommand *CvsControl::createInitialCheckoutCommand(const QString &url, auto command = new VcsBase::VcsCommand(baseDirectory.toString(), QProcessEnvironment::systemEnvironment()); command->setDisplayName(tr("CVS Checkout")); - command->addJob(m_plugin->client()->vcsBinary(), settings.addOptions(args), -1); + command->addJob({m_plugin->client()->vcsBinary(), settings.addOptions(args)}, -1); return command; } diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 1d771ca31f..f46b5ffe8a 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -1109,7 +1109,7 @@ CvsResponse CvsPlugin::runCvs(const QString &workingDirectory, } // Run, connect stderr to the output window const SynchronousProcessResponse sp_resp = - runVcs(workingDirectory, executable, client()->settings().addOptions(arguments), + runVcs(workingDirectory, {executable, client()->settings().addOptions(arguments)}, timeOutS, flags, outputCodec); response.result = CvsResponse::OtherError; |