diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-12 17:47:41 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-17 11:34:30 (GMT) |
| commit | 63434c07fbe4e3d8735a9e28200ce9b3b121bec8 (patch) | |
| tree | 78df0fc26c49814600e9ebef1272e60c3951a456 /qmake/generators | |
| parent | 6de735b5793aa1c5ddcba65b1110d3f9e1c64d1d (diff) | |
| download | Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.zip Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.tar.gz Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.tar.bz2 | |
fix QMAKE_SUBSTITUTES with shadow builds
still doesn't work for nested directories, but that's because
fileFixify() is plain broken.
on the way, remove a superfluous check: we know that the input file name
ends with .in - three lines up we made sure it does.
Reviewed-by: joerg
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 45a96f5..851e587 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -471,9 +471,9 @@ MakefileGenerator::init() subs.at(i).toLatin1().constData()); continue; } - QFile in(fileFixify(subs.at(i))), out(fileInfo(subs.at(i)).fileName()); - if(out.fileName().endsWith(".in")) - out.setFileName(out.fileName().left(out.fileName().length()-3)); + QFile in(fileFixify(subs.at(i))); + QFile out(fileFixify(subs.at(i).left(subs.at(i).length()-3), + qmake_getpwd(), Option::output_dir)); if(in.open(QFile::ReadOnly)) { QString contents; QStack<int> state; |