diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-06-16 13:41:27 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-06-16 13:41:27 (GMT) |
| commit | 186d66f01e0e489219e82ea732868a0520dc241b (patch) | |
| tree | d3c9c38f349f0c08e1ff04489dc59a3bb3c20909 /doc/src/installation.qdoc | |
| parent | cb6cd0e4159606619b1ce708c1b00f8d294cc4bb (diff) | |
| parent | 228b2f6494ebd95fc66993b00ecab065ec5fe5a5 (diff) | |
| download | Qt-186d66f01e0e489219e82ea732868a0520dc241b.zip Qt-186d66f01e0e489219e82ea732868a0520dc241b.tar.gz Qt-186d66f01e0e489219e82ea732868a0520dc241b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'doc/src/installation.qdoc')
| -rw-r--r-- | doc/src/installation.qdoc | 12 |
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. |