diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-14 19:34:40 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:06:10 +0000 |
| commit | 6accf40a147b97b8eda8b71268de013d72192359 (patch) | |
| tree | 40ce553400ef155ca4a2099f2763be14a2130b48 /qmake | |
| parent | ed4bdd3eec3d915b703307d2fe3dccb49a0ab838 (diff) | |
make fileFixify(FileFixifyAbsolute) pay attention to in_dir
... instead of sheepishly assuming qmake_pwd().
it also canonicalizes consistently with the relative output path now.
Change-Id: I86231f7259179020643405f3c0e696a74031aa4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake')
| -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); |