diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 01:06:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 01:06:26 (GMT) |
| commit | 95606772b0f12ab4bc51c2544d3c864153da4e2f (patch) | |
| tree | 8267b3d10bd59ca3ecad06f505d0a703df5d95f9 /tools | |
| parent | 5d1d426afe07458a91b4908881554653285ed04c (diff) | |
| parent | f02e04675d8c552a50c1f28b45665f1605b372f3 (diff) | |
| download | Qt-95606772b0f12ab4bc51c2544d3c864153da4e2f.zip Qt-95606772b0f12ab4bc51c2544d3c864153da4e2f.tar.gz Qt-95606772b0f12ab4bc51c2544d3c864153da4e2f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
fix "configure -fast" on Windows for other maketools than nmake
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d521276..153df10 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3700,7 +3700,7 @@ void Configure::generateMakefiles() QTextStream txt(&file); txt << "all:\n"; txt << "\t" << args.join(" ") << "\n"; - txt << "\t" << dictionary[ "MAKE" ] << " -f " << it->target << "\n"; + txt << "\t\"$(MAKE)\" -$(MAKEFLAGS) -f " << it->target << "\n"; txt << "first: all\n"; txt << "qmake:\n"; txt << "\t" << args.join(" ") << "\n"; |