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/libs/utils/archive.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/libs/utils/archive.cpp')
| -rw-r--r-- | src/libs/utils/archive.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp index 02be93b006e..120969b1243 100644 --- a/src/libs/utils/archive.cpp +++ b/src/libs/utils/archive.cpp @@ -251,13 +251,13 @@ Archive *Archive::unarchive(const FilePath &src, const FilePath &dest) QTimer::singleShot(0, archive, [archive, tool, workingDirectory] { archive->outputReceived( tr("Running %1\nin \"%2\".\n\n", "Running <cmd> in <workingdirectory>") - .arg(CommandLine(tool->executable, tool->arguments).toUserOutput(), + .arg(CommandLine(FilePath::fromString(tool->executable), tool->arguments).toUserOutput(), workingDirectory)); }); CommandLine cmd = tool->nativeWindowsArguments ? CommandLine{FilePath::fromString(tool->executable), tool->arguments[0], CommandLine::Raw} - : CommandLine{tool->executable, tool->arguments}; + : CommandLine{FilePath::fromString(tool->executable), tool->arguments}; archive->m_process->setCommand(cmd); archive->m_process->setWorkingDirectory(workingDirectory); archive->m_process->start(); |