From ab9641a58163e3e069eb439d17d6711eccbcb71c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Mon, 24 Sep 2012 16:05:33 +0200
Subject: [PATCH] Make sure qmake pathes are canonical when reading settings
Change-Id: Ide77979b2bc8a0c6e3547cea5f703259cc5ab339
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/qtsupport/baseqtversion.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 091b7a1d47d..85955dbab5e 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -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
--
GitLab