feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PathChooser: Make path/rawPath and fileName/rawFileName more consistent

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2016-06-24 13:45:51 +02:00
parent 891899dcd4
commit ff66f5c62f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/pathchooser.cpp
View File

@@ -306,16 +306,16 @@ void PathChooser::setEnvironment(const Environment &env)
} }
} }
QString PathChooser::path() const
{
return d->expandedPath(rawPath());
}
QString PathChooser::rawPath() const QString PathChooser::rawPath() const
{ {
return rawFileName().toString(); return rawFileName().toString();
} }
QString PathChooser::path() const
{
return fileName().toString();
}
FileName PathChooser::rawFileName() const FileName PathChooser::rawFileName() const
{ {
return FileName::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text())); return FileName::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text()));
@@ -323,7 +323,7 @@ FileName PathChooser::rawFileName() const
FileName PathChooser::fileName() const FileName PathChooser::fileName() const
{ {
return FileName::fromString(path()); return FileName::fromUserInput(d->expandedPath(rawFileName().toString()));
} }
// FIXME: try to remove again // FIXME: try to remove again