diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-06 16:58:42 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-07 12:39:10 +0200 |
| commit | fdbf1988ed2346b384e8052c893698fa22c76145 (patch) | |
| tree | c7ed0fae2b1fb9561ff51cce4afd889d31afbfb4 /src/lib | |
| parent | 6e84baa18751ac972a4e5c5300b48707f90057f9 (diff) | |
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 <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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; |