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

Make sure qmake pathes are canonical when reading settings

Browse Source 
Change-Id: Ide77979b2bc8a0c6e3547cea5f703259cc5ab339
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2012-09-24 16:05:33 +02:00
parent 766b9a92f1
commit ab9641a581
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -347,7 +347,8 @@ void BaseQtVersion::fromMap(const QVariantMap &map)
QString string = map.value(QLatin1String(QTVERSIONQMAKEPATH)).toString();
if (string.startsWith(QLatin1Char('~')))
string.remove(0, 1).prepend(QDir::homePath());
ctor(Utils::FileName::fromUserInput(string));
const QString canonical = QFileInfo(string).canonicalFilePath();
ctor(Utils::FileName::fromString(canonical.isEmpty() ? string : canonical));
}
QVariantMap BaseQtVersion::toMap() const