summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-06-18 11:37:19 (GMT)
committermread <qt-info@nokia.com>2009-06-18 11:37:19 (GMT)
commit821d87030693432b2eb5db0cdbc50c14196b3c90 (patch)
tree49b8031ddc513dc25fe1e62aeed569d33d6890de /doc
parent7f874fe9eb61eb155be02c7fc30e7a09d06d166b (diff)
parent553a0a8fb83b8ff82574e9b0831ba56d0fd93054 (diff)
downloadQt-821d87030693432b2eb5db0cdbc50c14196b3c90.zip
Qt-821d87030693432b2eb5db0cdbc50c14196b3c90.tar.gz
Qt-821d87030693432b2eb5db0cdbc50c14196b3c90.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'doc')
-rw-r--r--doc/src/installation.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 05188c7..c8310ff 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -906,8 +906,9 @@ If you are using pre-built binaries, follow the instructions
\list
\o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}
\list
- \o \bold{Note:} It is necessary to update Carbide compiler if you are using Carbide 2.0.2 or older.
- You can find a compiler patch \l{http://pepper.troll.no/s60prereleases/patches/}{here}.
+ \o \bold{Note:} It may be necessary to update the Carbide compiler.
+ See \l{http://pepper.troll.no/s60prereleases/patches/}{here} for instructions how to check your
+ compiler version and how to patch it, if needed.
\endlist
\o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
\o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}.