From fdbf1988ed2346b384e8052c893698fa22c76145 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 6 Aug 2014 16:58:42 +0200 Subject: Fix unclean source file paths resulting from groups with prefixes. Example: Group { prefix: "dir/" files: "../f.txt" } The file path would end up as "/build-dir/dir/../f.txt" after calling FileInfo::resolvePath(), when we expect a clean absolute path. Change-Id: I9a7edb94cdf0fd99ce2d61f362a57ff4b9a8d060 Reviewed-by: Joerg Bornemann --- src/lib/corelib/language/projectresolver.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 43e409be4..5e5eda739 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -431,6 +431,7 @@ SourceArtifactPtr ProjectResolver::createSourceArtifact(const ResolvedProductCon { SourceArtifactPtr artifact = SourceArtifact::create(); artifact->absoluteFilePath = FileInfo::resolvePath(rproduct->sourceDirectory, fileName); + artifact->absoluteFilePath = QDir::cleanPath(artifact->absoluteFilePath); // Potentially necessary for groups with prefixes. artifact->fileTags = fileTags; artifact->overrideFileTags = overrideTags; artifact->properties = properties; -- cgit v1.2.3