diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-03 08:35:21 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-03 08:35:21 (GMT) |
| commit | c7f9a6890b3f5220d83af64fe26eb328c9626295 (patch) | |
| tree | 11caf4e1f2f5378802f421d72c6d80ea4aab8e53 | |
| parent | 7f1d1d94160e9ef4da85eb2780ab17af1a482848 (diff) | |
| download | Qt-c7f9a6890b3f5220d83af64fe26eb328c9626295.zip Qt-c7f9a6890b3f5220d83af64fe26eb328c9626295.tar.gz Qt-c7f9a6890b3f5220d83af64fe26eb328c9626295.tar.bz2 | |
Revert "Fixed qmake to run extra compilers in the build dir."
This reverts commit 7f1d1d94160e9ef4da85eb2780ab17af1a482848.
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 5bd51a6..819cdaf 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -203,11 +203,7 @@ 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); } |