diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-13 19:25:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:06:06 +0000 |
| commit | ed4bdd3eec3d915b703307d2fe3dccb49a0ab838 (patch) | |
| tree | 387d6caefcb0abe01716b0fd39faaa93758774bb /qmake/generators/makefile.cpp | |
| parent | b5322502372893a9270e9981e7d4223da96ccfc2 (diff) | |
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 <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
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 = ""; |