diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-25 10:35:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-25 10:35:42 +0200 |
| commit | 0ba4781bfc0a23d6f2b7f597274c2bbc62c48c1a (patch) | |
| tree | 3cbff9325fba3b802360ccc8aaf1cac813e50172 /src/plugins/vcsbase | |
| parent | a5952658b240e1d2761b943ed7514e4589b986fe (diff) | |
| parent | f229f0dbe51be6a8b0c4fb0a1948bde935f7b423 (diff) | |
| download | qt-creator-0ba4781bfc0a23d6f2b7f597274c2bbc62c48c1a.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I889b93611d1762121548fb71d1d3493e4adba313
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 3a0256e5f3..e140902566 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -224,6 +224,8 @@ VcsCommand *VcsBaseClientImpl::vcsExec(const QString &workingDirectory, const QS useOutputToWindow ? VcsWindowOutputBind : NoOutputBind); command->setCookie(cookie); command->addFlags(additionalFlags); + if (editor) + command->setCodec(editor->codec()); enqueueJob(command, arguments); return command; } |