summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-04-24 13:01:20 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-04-27 09:06:13 +0000
commit2b6ce6cea5ffffc2f788ba08f3d9bb06bfcd498e (patch)
treeeac584b270207b5c12e7136c57990f2569126809 /src/plugins/projectexplorer
parent92c7662acb8fdb6810cbc949844ce112bc9117dd (diff)
downloadqt-creator-2b6ce6cea5ffffc2f788ba08f3d9bb06bfcd498e.tar.gz
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 <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r--src/plugins/projectexplorer/projectconfigurationaspects.cpp4
-rw-r--r--src/plugins/projectexplorer/runconfigurationaspects.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.cpp b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
index 44e765e3c1..588318de59 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 4ec47bca4e..343ca369ea 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);
}