From ed4bdd3eec3d915b703307d2fe3dccb49a0ab838 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 13 Apr 2015 19:25:50 +0200 Subject: fileFixify(): remove bizarre canonicalization 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 Reviewed-by: Oswald Buddenhagen --- qmake/generators/makefile.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index e6eb6e27cd..ea8b43e219 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -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 = ""; -- cgit v1.2.3