summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/getting-started/installation.qdoc7
-rw-r--r--doc/src/snippets/code/doc_src_installation.qdoc5
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 2217a90..1a20be9 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -589,6 +589,10 @@ If you are using pre-built binaries, follow the instructions
To configure Qt for S60, do:
\snippet doc/src/snippets/code/doc_src_installation.qdoc 23
+ to build the tools using MinGW, and the libraries using abld.
+ or
+ \snippet doc/src/snippets/code/doc_src_installation.qdoc 31
+ to build the tools using MinGW, and the libraries using sbsv2.
For other options, type \c{configure -help} to get a list of all available
options.
@@ -957,6 +961,7 @@ If you are using pre-built binaries, follow the instructions
Qt for S60 requires the following software installed on your development PC:
\list
+ \o \l{http://www.mingw.org/}{MinGW 3.4.5 or higher}, or another windows compiler to build the tools.
\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 may be necessary to update the Carbide compiler.
@@ -966,7 +971,7 @@ If you are using pre-built binaries, follow the instructions
\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.
- \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 616] or later,
+ \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 686] or later,
which is not available free of charge.
\endlist
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 412cee3..68765ec 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -204,3 +204,8 @@ make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<cer
cd embedded\fluidlauncher
make sis QT_SIS_OPTIONS=-i
//! [30]
+
+//! [31]
+cd \Qt\%VERSION%
+configure -platform win32-g++ -xplatform symbian-sbsv2
+//! [31]