Commit ab9641a5 authored by Tobias Hunger's avatar Tobias Hunger

Make sure qmake pathes are canonical when reading settings

Change-Id: Ide77979b2bc8a0c6e3547cea5f703259cc5ab339
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 766b9a92
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment