diff options
author | hjk <[email protected]> | 2021-08-10 16:19:02 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2021-08-17 05:34:10 +0000 |
commit | 7c28c4f744e11adda5fcf86270d680797b33f223 (patch) | |
tree | 04aea004daa9cc46faaea2cff1ef97c2934ee2d5 /src/plugins/git/gitclient.cpp | |
parent | 98cba6e50c899a672000575bf060541e0b61e456 (diff) |
Utils: Introduce a FilePath constructor from char arrays
Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for
decorations in user code.
At the same time, drop some convenience constructors and functions
in CommandLine and Icon essentially serving the same purpose.
Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r-- | src/plugins/git/gitclient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index edfad745ca2..3898758558b 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2593,7 +2593,8 @@ bool GitClient::tryLauchingGitK(const Environment &env, arguments.append(ProcessArgs::splitArgs(gitkOpts, HostOsInfo::hostOs())); if (!fileName.isEmpty()) arguments << "--" << fileName; - VcsOutputWindow::appendCommand(workingDirectory.toString(), {binary, arguments}); + VcsOutputWindow::appendCommand(workingDirectory.toString(), + {FilePath::fromString(binary), arguments}); // This should always use QProcess::startDetached (as not to kill // the child), but that does not have an environment parameter. bool success = false; |