diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-21 10:07:46 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-21 10:07:46 (GMT) |
| commit | 895046d54eee97d838dea1fdcb34a7dff3d91f98 (patch) | |
| tree | 80bef9bd8cd2d11e448e31aa8d2f69ade312eff5 /tools | |
| parent | f4a10959e579f6c8d77defa24107a5f6a02749b9 (diff) | |
| download | Qt-895046d54eee97d838dea1fdcb34a7dff3d91f98.zip Qt-895046d54eee97d838dea1fdcb34a7dff3d91f98.tar.gz Qt-895046d54eee97d838dea1fdcb34a7dff3d91f98.tar.bz2 | |
Revert "Switch from *-armv5 to *-armv6."
This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a.
armv6 is not supported by public SDKs, due to armv6/urel not existing.
Such SDKs needs to be fixed by copying the armv5 files. Hence we revert,
and postpone until we have SDKs which actually support armv6, and until
we have a stronger insight into what advantages armv6 brings.
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 02375b3..f57f3a8 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-armv6|release-armv6"); + 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"]; |