diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 20:36:46 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 20:36:46 +1000 |
| commit | 86b43e8186055ea232ae94e708d3cd381fa179df (patch) | |
| tree | 8e20492c61a3925248c18e98bb229821dbf9f246 /qmake/generators/win32/msvc_nmake.cpp | |
| parent | 1a742a039802b32cfe2a92d8ef1a04c3a21a964f (diff) | |
| parent | fab911a64a72d5b7f450f3f3616e38c96d601553 (diff) | |
| download | qt4-tools-86b43e8186055ea232ae94e708d3cd381fa179df.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
qmake vc(x)proj generator: support x64 Qt builds
qmake: remove dead code from VcxprojGenerator
qmake nmake generator: pass MAKEFLAGS to sub-make calls
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 0565c53256..52eaaceda1 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -86,6 +86,15 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) return false; } +void NmakeMakefileGenerator::writeSubMakeCall(QTextStream &t, const QString &callPrefix, + const QString &makeArguments, const QString &callPostfix) +{ + // Pass MAKEFLAGS as environment variable to sub-make calls. + // Unlike other make tools nmake doesn't do this automatically. + t << "\n\t@set MAKEFLAGS=$(MAKEFLAGS)"; + Win32MakefileGenerator::writeSubMakeCall(t, callPrefix, makeArguments, callPostfix); +} + QString NmakeMakefileGenerator::getPdbTarget() { return QString(project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".pdb"); |