summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-16 11:59:52 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-16 11:59:52 (GMT)
commit5c858bdb9cfb1998b202c76c48913a3fd96c8dee (patch)
tree1827adbdd5b38d0b1c0780a0695fe1a2be7b971a /doc
parent18fcfc3576b7bcbcf3326697461f21fab990512b (diff)
downloadQt-5c858bdb9cfb1998b202c76c48913a3fd96c8dee.zip
Qt-5c858bdb9cfb1998b202c76c48913a3fd96c8dee.tar.gz
Qt-5c858bdb9cfb1998b202c76c48913a3fd96c8dee.tar.bz2
Installation instructions update
Diffstat (limited to 'doc')
-rw-r--r--doc/src/installation.qdoc12
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 13af50c..05188c7 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -554,9 +554,9 @@ in the \l{Qt for S60 Requirements} document.
\note Qt for S60 has some requirements that are given in more detail
in the \l{Qt for S60 Requirements} document.
-\note This document describes how to install Qt for S60 from the source package.
-Go \l{Installing Qt on S60 using binary package}{here} for instructions on how to install
-Qt using binary package.
+\note \bold {This document describes how to install and configure Qt for S60 from scratch.
+If you are using pre-built binaries, follow the instructions
+\l{Installing Qt on S60 using binary package}{here}.}
\list 1
@@ -904,7 +904,11 @@ Qt using binary package.
Qt for S60 requires the following software installed on your development PC:
\list
- \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}
+ \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}.
+ \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}.
Install this to all S60 SDKs you plan to use Qt with.