1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fileFixify(): remove bizarre canonicalization

Browse Source 
it would trigger only if the input file name was already absolute,
matched the native path separator, and some (likely) other conditions.

as this behavior was almost unpredictable, it would be not very useful.
so save ourselves the headache and just remove it.

Change-Id: Ic457f487f6d0ce9f7a5f192859c9efa9c2de2b63
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-04-13 19:25:50 +02:00
parent b532250237
commit ed4bdd3eec
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/makefile.cpp
View File

@ -2865,9 +2865,6 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
qfileinfo.setFile(ret);
}
ret = Option::fixPathToTargetOS(ret, false, canon);
if(canon && qfileinfo.exists() &&
file == Option::fixPathToTargetOS(ret, true, canon))
ret = Option::fixPathToTargetOS(qfileinfo.canonicalFilePath());
QString match_dir = Option::fixPathToTargetOS(out_dir, false, canon);
if(ret == match_dir) {
ret = "";