diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-06-24 13:45:51 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-06-27 09:22:37 +0000 |
| commit | ff66f5c62f20e55375852c353bdf21509377a9cf (patch) | |
| tree | 40ff5f23a5ea785476d10fd9ff3227657aed850a | |
| parent | 891899dcd48d9151305ea0ffd5eb20993ef0f0e4 (diff) | |
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 <hjk@theqtcompany.com>
| -rw-r--r-- | src/libs/utils/pathchooser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index fc0fa389b2..edf0384f2d 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -306,14 +306,14 @@ void PathChooser::setEnvironment(const Environment &env) } } -QString PathChooser::path() const +QString PathChooser::rawPath() const { - return d->expandedPath(rawPath()); + return rawFileName().toString(); } -QString PathChooser::rawPath() const +QString PathChooser::path() const { - return rawFileName().toString(); + return fileName().toString(); } FileName PathChooser::rawFileName() const @@ -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 |