diff options
| author | Iain <qt-info@nokia.com> | 2009-09-21 09:09:57 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-09-21 09:16:07 (GMT) |
| commit | 0ebdd27ea802a4b40eaa330725e15213a4072cdc (patch) | |
| tree | 9a6def31321752b89fa7fced6d3715afbba0ee83 | |
| parent | 42563fa22cfe7d6be252df69244c8196f498444d (diff) | |
| download | Qt-0ebdd27ea802a4b40eaa330725e15213a4072cdc.zip Qt-0ebdd27ea802a4b40eaa330725e15213a4072cdc.tar.gz Qt-0ebdd27ea802a4b40eaa330725e15213a4072cdc.tar.bz2 | |
Update recommendation for make command to run after configure for Symbian
The makefile written for calling the Symbian build tools is for GNU make
not nmake, so print an accurate message when -xplatform is
symbian-<whatever>
We still don't make the correct recommendation for the confclean target
but that doesn't work anyway (see QTBUG-4536)
Reviewed-by: Jason Barron
| -rwxr-xr-x | configure.exe | bin | 1168384 -> 1167872 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 c428581..12e8431 100755 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 94f7915..48d9370 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1164,7 +1164,7 @@ void Configure::parseCmdLine() dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"]; if (dictionary.contains("XQMAKESPEC")) { if (dictionary["XQMAKESPEC"].startsWith("symbian")) { - dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"] + QString(" debug-winscw|debug-armv5|release-armv5"); + dictionary["QTBUILDINSTRUCTION"] = QString("make debug-winscw|debug-armv5|release-armv5"); } else if (dictionary["XQMAKESPEC"].startsWith("wince")) { dictionary["QTBUILDINSTRUCTION"] = QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"]; |