From b0c92ff222f0a74e9eb74347244f8c21064a98a3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 17 Mar 2011 20:30:23 +0100
Subject: [PATCH] resolve symlinks in project files' parent directories
this is needed for following relative includes from files with symlinks
in their path (e.g., the default qmakespec pointing to
qws/linux-sh-g++).
Task-number: QTCREATORBUG-1513
---
src/shared/proparser/proitems.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/shared/proparser/proitems.cpp b/src/shared/proparser/proitems.cpp
index 9d1f8fa5c87..6bceb34ed0c 100644
--- a/src/shared/proparser/proitems.cpp
+++ b/src/shared/proparser/proitems.cpp
@@ -340,7 +340,8 @@ ProFile::ProFile(const QString &fileName)
m_ok(true)
{
if (!fileName.startsWith(QLatin1Char('(')))
- m_directoryName = fileName.left(fileName.lastIndexOf(QLatin1Char('/')));
+ m_directoryName = QFileInfo( // qmake sickness: canonicalize only the directory!
+ fileName.left(fileName.lastIndexOf(QLatin1Char('/')))).canonicalFilePath();
}
ProFile::~ProFile()
--
GitLab