From e37796d1c611d64ff779c6599bf6327b6b45e2fb Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Tue, 30 Jul 2024 10:05:27 +0200 Subject: [PATCH] ProjectExplorer: Fix uses of "FilePath::toString" Change-Id: I7199dec620b7e09765c44b571b93575eda5c5a74 Reviewed-by: hjk --- src/plugins/projectexplorer/processparameters.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/processparameters.cpp b/src/plugins/projectexplorer/processparameters.cpp index 797184b72b9..54a5dffcdb0 100644 --- a/src/plugins/projectexplorer/processparameters.cpp +++ b/src/plugins/projectexplorer/processparameters.cpp @@ -100,11 +100,11 @@ FilePath ProcessParameters::effectiveCommand() const if (m_macroExpander) cmd = m_macroExpander->expand(cmd); if (cmd.needsDevice()) { - // Assume this is already good. FIXME: It is possibly not, so better fix searchInPath. + // Assume this is already good. FIXME: It is possibly not, so better fix searchInPath. m_effectiveCommand = cmd; } else { - m_effectiveCommand = m_runData.environment.searchInPath(cmd.toString(), - {effectiveWorkingDirectory()}); + m_effectiveCommand + = m_runData.environment.searchInPath(cmd.path(), {effectiveWorkingDirectory()}); } m_commandMissing = m_effectiveCommand.isEmpty(); if (m_commandMissing) @@ -135,10 +135,10 @@ QString ProcessParameters::effectiveArguments() const QString ProcessParameters::prettyCommand() const { - QString cmd = m_runData.command.executable().toString(); + FilePath cmd = m_runData.command.executable(); if (m_macroExpander) cmd = m_macroExpander->expand(cmd); - return FilePath::fromString(cmd).fileName(); + return cmd.fileName(); } QString ProcessParameters::prettyArguments() const @@ -183,7 +183,7 @@ QString ProcessParameters::summaryInWorkdir(const QString &displayName) const displayName, ProcessArgs::quoteArg(prettyCommand()).toHtmlEscaped(), prettyArguments().toHtmlEscaped(), - QDir::toNativeSeparators(effectiveWorkingDirectory().toString())); + effectiveWorkingDirectory().toUserOutput()); } } // ProcessExplorer