From 2b6ce6cea5ffffc2f788ba08f3d9bb06bfcd498e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 24 Apr 2020 13:01:20 +0200 Subject: [PATCH] Fix display of some file paths on Windows In particular, the "executable on host" field on RemoteLinux & friends had the wrong separators. Change-Id: Ic36d73e863c78dcefd5c670537dd7c86b081d173 Reviewed-by: hjk --- src/plugins/projectexplorer/projectconfigurationaspects.cpp | 4 ++-- src/plugins/projectexplorer/runconfigurationaspects.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.cpp b/src/plugins/projectexplorer/projectconfigurationaspects.cpp index 44e765e3c19..588318de592 100644 --- a/src/plugins/projectexplorer/projectconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/projectconfigurationaspects.cpp @@ -178,12 +178,12 @@ void BaseStringAspect::toMap(QVariantMap &map) const FilePath BaseStringAspect::filePath() const { - return FilePath::fromString(d->m_value); + return FilePath::fromUserInput(d->m_value); } void BaseStringAspect::setFilePath(const FilePath &val) { - setValue(val.toString()); + setValue(val.toUserOutput()); } void BaseStringAspect::setLabelText(const QString &labelText) diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 4ec47bca4e4..343ca369ea9 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -469,7 +469,7 @@ void ExecutableAspect::setPlaceHolderText(const QString &placeHolderText) void ExecutableAspect::setExecutable(const FilePath &executable) { - m_executable.setValue(executable.toString()); + m_executable.setFilePath(executable); m_executable.setShowToolTipOnLabel(true); }