diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2023-01-30 13:52:30 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2023-01-30 17:51:47 +0000 |
| commit | 86ffc29239ec891e307b2c5865ce56c53841e388 (patch) | |
| tree | 6e8539471809afa3424215c680b456af55b48c98 /src/plugins/git/gitplugin.cpp | |
| parent | 7cd4c295c71c7aca2db7ef5a76272f86a51fc2ae (diff) | |
| download | qt-creator-86ffc29239ec891e307b2c5865ce56c53841e388.tar.gz | |
Git: Avoid passing strings to resolve text encodings
Therefore, merge the code of codecFor() and encoding()
to avoid further mis-usage.
Change-Id: I086e4ace6c791d16f43f14c423b6529ad199c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 5fec91b58d..25c7febadb 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1581,7 +1581,7 @@ void GitPluginPrivate::instantBlame() const CommitInfo info = parseBlameOutput(output.split('\n'), filePath, m_author); m_blameMark.reset(new BlameMark(filePath, line, info)); }; - QTextCodec *codec = GitClient::instance()->encoding(workingDirectory, "i18n.commitEncoding"); + QTextCodec *codec = GitClient::instance()->encoding(GitClient::EncodingCommit, workingDirectory); GitClient::instance()->vcsExecWithHandler(workingDirectory, {"blame", "-p", "-L", lineString, "--", filePath.toString()}, this, commandHandler, RunFlags::NoOutput, codec); |