diff options
| author | hjk <hjk@qt.io> | 2021-08-10 16:19:02 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-08-17 05:34:10 +0000 |
| commit | 7c28c4f744e11adda5fcf86270d680797b33f223 (patch) | |
| tree | 04aea004daa9cc46faaea2cff1ef97c2934ee2d5 /src/plugins/coreplugin/patchtool.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 <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/patchtool.cpp')
| -rw-r--r-- | src/plugins/coreplugin/patchtool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index 4e43d6d5ea6..ce40a79d017 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -104,7 +104,7 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect .arg(QDir::toNativeSeparators(workingDirectory), QDir::toNativeSeparators(patch), args.join(QLatin1Char(' ')))); - patchProcess.setCommand({patch, args}); + patchProcess.setCommand({FilePath::fromString(patch), args}); patchProcess.setWriteData(input); patchProcess.start(); if (!patchProcess.waitForStarted()) { |