diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2009-12-02 19:56:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-02 19:56:46 (GMT) |
| commit | 7f1d1d94160e9ef4da85eb2780ab17af1a482848 (patch) | |
| tree | c78806b12997676abc7fbebaa62b4eb7da37b223 | |
| parent | a778ee7c030b207c0c4e8d46c2bc05da47d8f68d (diff) | |
| download | Qt-7f1d1d94160e9ef4da85eb2780ab17af1a482848.zip Qt-7f1d1d94160e9ef4da85eb2780ab17af1a482848.tar.gz Qt-7f1d1d94160e9ef4da85eb2780ab17af1a482848.tar.bz2 | |
Fixed qmake to run extra compilers in the build dir.
Merge-request: 1881
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 819cdaf..5bd51a6 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -203,7 +203,11 @@ BuildsMetaMakefileGenerator::write(const QString &oldpwd) } else if(build == glue) { ret = build->makefile->writeProjectMakefile(); } else { + // ensure that extra compilers are run in the build dir + QString bakpwd = qmake_getpwd(); + qmake_setpwd(oldpwd); ret = build->makefile->write(); + qmake_setpwd(bakpwd); if (glue && glue->makefile->supportsMergedBuilds()) ret = glue->makefile->mergeBuildProject(build->makefile); } |