diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-02-26 13:45:55 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-02-26 13:45:55 (GMT) |
| commit | 8733baf8b770a5fca12aecf4c38a8c8f94c4b0fa (patch) | |
| tree | d407e3de10be4fd5b672b6ee12fa7de4a9333acb | |
| parent | bab066cd455ef424ec75753273b1e0d4f3aae710 (diff) | |
| download | Qt-8733baf8b770a5fca12aecf4c38a8c8f94c4b0fa.zip Qt-8733baf8b770a5fca12aecf4c38a8c8f94c4b0fa.tar.gz Qt-8733baf8b770a5fca12aecf4c38a8c8f94c4b0fa.tar.bz2 | |
fix "configure -fast" on Windows for other maketools than nmake
Task-number: QTBUG-8562
Reviewed-by: ossi
| -rwxr-xr-x | configure.exe | bin | 1008128 -> 1212416 bytes | |||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 9974236..3e51833 100755 --- a/configure.exe +++ b/configure.exe 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"; |