diff options
author | hjk <hjk@qt.io> | 2021-08-17 13:37:20 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2021-08-17 11:55:11 +0000 |
commit | 59c01481d1d84a77fde8a058b531203f614c98c2 (patch) | |
tree | ff43cc3aa8287505a49c1ab980e2ff8345abfbb5 /src/plugins/vcsbase/vcsbaseeditor.cpp | |
parent | bd4a501f15f32851697517d959d28c9ee681174f (diff) | |
download | qt-creator-59c01481d1d84a77fde8a058b531203f614c98c2.tar.gz |
Core: PatchTool code cosmetics
Some more FilePath use, QLatin*, static, ...
Also fix default settings values, amends e2eab0e0 insofar.
Change-Id: I8e40ca9629351db3b3095636b4ea29a204f86da6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditor.cpp')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 1bfe550bc4..d24b96dd5f 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1539,7 +1539,7 @@ bool VcsBaseEditorWidget::canApplyDiffChunk(const DiffChunk &dc) const bool VcsBaseEditorWidget::applyDiffChunk(const DiffChunk &dc, bool revert) const { return Core::PatchTool::runPatch(dc.asPatch(d->m_workingDirectory), - d->m_workingDirectory, 0, revert); + FilePath::fromString(d->m_workingDirectory), 0, revert); } QString VcsBaseEditorWidget::fileNameFromDiffSpecification(const QTextBlock &inBlock, QString *header) const |