diff options
| -rw-r--r-- | qmake/generators/makefile.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index ea8b43e219..7e118b127c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2839,7 +2839,12 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q } if(fix == FileFixifyAbsolute || (fix == FileFixifyDefault && project->isActiveConfig("no_fixpath"))) { if(fix == FileFixifyAbsolute && QDir::isRelativePath(ret)) { //already absolute - QString pwd = qmake_getpwd(); + QString pwd = QDir(qmake_getpwd()).absoluteFilePath(in_d); + { + QFileInfo in_fi(fileInfo(pwd)); + if (in_fi.exists()) + pwd = in_fi.canonicalFilePath(); + } if (!pwd.endsWith(QLatin1Char('/'))) pwd += QLatin1Char('/'); ret.prepend(pwd); |