diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-18 11:32:33 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-18 11:32:33 (GMT) |
| commit | a908a082425b3a7644eb8f4ea47dc69da1f467d9 (patch) | |
| tree | 0281597437310192276a81fe399d08d5bfe3f54a /qmake/generators/makefile.cpp | |
| parent | bc0328e334f456c789a18eb254af4427ea730187 (diff) | |
| parent | 3ae514c6cd55cb0f63eea13c9d23593db38beee8 (diff) | |
| download | Qt-a908a082425b3a7644eb8f4ea47dc69da1f467d9.zip Qt-a908a082425b3a7644eb8f4ea47dc69da1f467d9.tar.gz Qt-a908a082425b3a7644eb8f4ea47dc69da1f467d9.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -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; |