From ff66f5c62f20e55375852c353bdf21509377a9cf Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 24 Jun 2016 13:45:51 +0200 Subject: [PATCH] PathChooser: Make path/rawPath and fileName/rawFileName more consistent This moves the fromUserInput that used to be in rawFileName to fileName, so that fileName produces the same output it used to produce. Change-Id: Ifb209af3f60d959c3f7119ebfa20f999c5d5f0ca Reviewed-by: hjk --- src/libs/utils/pathchooser.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index fc0fa389b29..edf0384f2db 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -306,16 +306,16 @@ void PathChooser::setEnvironment(const Environment &env) } } -QString PathChooser::path() const -{ - return d->expandedPath(rawPath()); -} - QString PathChooser::rawPath() const { return rawFileName().toString(); } +QString PathChooser::path() const +{ + return fileName().toString(); +} + FileName PathChooser::rawFileName() const { return FileName::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text())); @@ -323,7 +323,7 @@ FileName PathChooser::rawFileName() const FileName PathChooser::fileName() const { - return FileName::fromString(path()); + return FileName::fromUserInput(d->expandedPath(rawFileName().toString())); } // FIXME: try to remove again