From 7f1d1d94160e9ef4da85eb2780ab17af1a482848 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 2 Dec 2009 20:56:46 +0100 Subject: Fixed qmake to run extra compilers in the build dir. Merge-request: 1881 Reviewed-by: Thiago Macieira --- qmake/generators/metamakefile.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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); } -- cgit v0.12