diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-19 14:51:33 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-21 08:23:11 (GMT) |
| commit | a6af1538ea53408399fb29870a4ef16a92c7893a (patch) | |
| tree | 650647006e6f13dfdde00fa78421c966360a6f54 /tools | |
| parent | efd2bbd159bb4810ed828c842f459e6fcb8eb783 (diff) | |
| download | Qt-a6af1538ea53408399fb29870a4ef16a92c7893a.zip Qt-a6af1538ea53408399fb29870a4ef16a92c7893a.tar.gz Qt-a6af1538ea53408399fb29870a4ef16a92c7893a.tar.bz2 | |
Switch from *-armv5 to *-armv6.
Change from armv5 to armv6 by default. This updates documentation, the
convenience scripts, and the Raptor/abld qmake generator to use armv6 instead.
Task-number: QTBUG-4891
Reviewed-by: Jason Barron
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 f57f3a8..02375b3 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"] = QString("make debug-winscw|debug-armv5|release-armv5"); + dictionary["QTBUILDINSTRUCTION"] = QString("make debug-winscw|debug-armv6|release-armv6"); } else if (dictionary["XQMAKESPEC"].startsWith("wince")) { dictionary["QTBUILDINSTRUCTION"] = QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"]; |