summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-06-18 06:41:10 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-06-18 06:41:10 (GMT)
commit9ad849c8520e3a1efe47f1f67fb675c8e7754054 (patch)
tree188622a4c277d4ff0f372ec78216fcefec8c466a /doc/src
parent2b09eb0937985015e1ecc42a8bd39f0bc4c84b17 (diff)
parentf0f77eadbefdae45c70945392f6acdc21d47c601 (diff)
downloadQt-9ad849c8520e3a1efe47f1f67fb675c8e7754054.zip
Qt-9ad849c8520e3a1efe47f1f67fb675c8e7754054.tar.gz
Qt-9ad849c8520e3a1efe47f1f67fb675c8e7754054.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'doc/src')
-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}.