summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-19 14:51:33 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-21 08:23:11 (GMT)
commita6af1538ea53408399fb29870a4ef16a92c7893a (patch)
tree650647006e6f13dfdde00fa78421c966360a6f54 /doc
parentefd2bbd159bb4810ed828c842f459e6fcb8eb783 (diff)
downloadQt-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 'doc')
-rw-r--r--doc/src/snippets/code/doc_src_s60-introduction.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
index 8949df6..c9c6fd9 100644
--- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc
+++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
@@ -50,16 +50,16 @@
//! [2]
qmake
- make debug-winscw release-armv5
+ make debug-winscw release-armv6
make sis
//! [2]
//! [3]
- make sis QT_SIS_TARGET=debug-armv5
+ make sis QT_SIS_TARGET=debug-armv6
//! [3]
//! [4]
- set QT_SIS_TARGET=debug-armv5
+ set QT_SIS_TARGET=debug-armv6
make sis
//! [4]