Fixed some S60 installation documentation issues.

Task-number: QT-2204
Reviewed-by: Janne Anttila

3 files changed, 39 insertions, 34 deletions

diff --git a/README.s60 b/README.s60
index c3108af..f9d7aaf 100644
--- a/README.s60
+++ b/README.s60
@@ -5,16 +5,16 @@ this pre-release you can make advanced graphical applications and
 utilize TCP/IP connections. More specifically, these modules are now
 available for S60:
 
-QtCore    - http://doc.trolltech.com/4.5/qtcore.html
-QtGui     - http://doc.trolltech.com/4.5/qtgui.html
-QtNetwork - http://doc.trolltech.com/4.5/qtnetwork.html
-QtScript  - http://doc.trolltech.com/4.5/qtscript.html
-QtSql     - http://doc.trolltech.com/4.5/qtsql.html
-QtSvg     - http://doc.trolltech.com/4.5/qtsvg.html
-QtTest    - http://doc.trolltech.com/4.5/qttest.html
-QtWebKit  - http://doc.trolltech.com/4.5/qtwebkit.html
-QtXml     - http://doc.trolltech.com/4.5/qtxml.html
-Phonon    - http://doc.trolltech.com/4.5/phonon-module.html
+QtCore    - http://doc.trolltech.com/4.6/qtcore.html
+QtGui     - http://doc.trolltech.com/4.6/qtgui.html
+QtNetwork - http://doc.trolltech.com/4.6/qtnetwork.html
+QtScript  - http://doc.trolltech.com/4.6/qtscript.html
+QtSql     - http://doc.trolltech.com/4.6/qtsql.html
+QtSvg     - http://doc.trolltech.com/4.6/qtsvg.html
+QtTest    - http://doc.trolltech.com/4.6/qttest.html
+QtWebKit  - http://doc.trolltech.com/4.6/qtwebkit.html
+QtXml     - http://doc.trolltech.com/4.6/qtxml.html
+Phonon    - http://doc.trolltech.com/4.6/phonon-module.html
 
 INSTALLING Qt
 
@@ -23,7 +23,7 @@ Follow the instructions in the INSTALL file.
 REFERENCE DOCUMENTATION
 
 The Qt reference documentation is available locally in Qt's doc/html
-directory or at http://doc.trolltech.com/4.5/index.html
+directory or at http://doc.trolltech.com/4.6/index.html
 
 SUPPORTED PLATFORMS
 
@@ -67,7 +67,7 @@ such a program can be created with some minor changes to one of the
 many example programs in Qt's examples directory.
 
 
-                   INSTALLING Qt/S60 Version %VERSION%
+                   INSTALLING Qt for S60 Version %VERSION%
 
 1.  Install needed IDE and SDKs
 
@@ -86,7 +86,10 @@ many example programs in Qt's examples directory.
     - Open C/C++ v1.6.0 or higher. Install this to all S60 SDKs you plan to use Qt with:
       http://www.forum.nokia.com/main/resources/technologies/openc_cpp/
     
-    - Building Qt libraries for real device requires RVCT 2.2 [build 616] or later:
+    - Building Qt tools requires a windows compiler, e.g. MinGW 3.4.5 or higher.
+      http://www.mingw.org/
+    
+    - Building Qt libraries for real device requires RVCT 2.2 [build 686] or later:
       http://www.arm.com/products/DevTools/RVCT.html
     
     Make sure you have the following packages installed on any device you want to use to
@@ -132,21 +135,21 @@ many example programs in Qt's examples directory.
     To configure Qt for S60, do:
 
         cd \Qt\%VERSION%
-        configure -platform win32-mwc -xplatform symbian-abld
+        configure -platform win32-g++ -xplatform symbian-abld
 
     For other options, type "configure -help" to get a list of all available
     options.
 
 5.  Build Qt
 
-    To build Qt for the device, type:
-
-        make release-armv5
- 
     To build Qt for the emulator, type:
 
         make debug-winscw
 
+    To build Qt for the device, type:
+
+        make release-armv5
+ 
     Congratulations, Qt is now ready to use.
 
 6.  Running Qt demos
@@ -156,7 +159,7 @@ many example programs in Qt's examples directory.
     a real device, you first have to install the Qt libraries on the device:
 
         cd src\s60installs
-        createpackage -i qt_libs_armv5_urel.pkg <certificate file> <certificate key file>
+        createpackage -i Qt_for_S60_template.pkg release-armv5 <certificate file> <certificate key file>
 
     Note: You will need to supply certificate that allows installation of 
           binaries with "All -Tcb" capability to your device.
@@ -164,9 +167,9 @@ many example programs in Qt's examples directory.
     Similarly, install fluidlauncher to the device:
 
         cd embedded\fluidlauncher
-        createpackage -i fluidlauncher_armv5_urel.pkg
+        createpackage -i fluidlauncher_template.pkg release-armv5
 
-    This will create a self-signed fluidlauncher_armv5_urel.sisx and install it to your device.
+    This will create a self-signed fluidlauncher_release-armv5.sis and install it to your device.
 
     To run the demos on the emulator simply navigate to the directory of the demo and run:
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 1a20be9..539c1d5 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -599,14 +599,14 @@ If you are using pre-built binaries, follow the instructions
 
     \o  Build Qt
 
-        To build Qt for the device, type:
-
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
-        
         To build Qt for the emulator, type:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 24
 
+        To build Qt for the device, type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
+        
         Congratulations, Qt is now ready to use.
 
     \o  Running Qt demos
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index 045d740..d0a1976 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -90,7 +90,7 @@
     \row \o \c debug-armv5   \o Build debug binaries for hardware using RVCT.
     \row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
     \row \o \c run           \o Run the emulator binaries from the build directory.
-    \row \o \c sis          \o Create signed \c .sis file for project.
+    \row \o \c sis           \o Create signed \c .sis file for project.
     \endtable
 
     The following lines perform a debug build for the emulator
@@ -106,7 +106,7 @@
     To install your own applications on hardware, you need signed \c .sis file.
     The signed \c .sis file can be created with \c make \c sis target. \c sis target
     is only supported for executables or projects with \c DEPLOYMENT statements.
-    By default the \c sis target will create signed \.sis file for last build
+    By default the \c sis target will create signed \c .sis file for last build
     target. For example, the following sequence will generate the needed makefiles, 
     build the project for \c debug-winscw and \c release-armv5, and create 
     self-signed \c .sis file for \c release-armv5 target:
@@ -119,8 +119,10 @@
     
     \table
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
-                                       Currently only -i, install the package right away 
-                                       using PC suite, is supported.
+                                       -i, install the package right away using PC suite.
+                                       -c=<file>, read certificate information from a file.
+                                       Execute \c{perl createpackage.pl} for more information
+                                       about options.
                                        By default no otions are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in 
@@ -133,13 +135,13 @@
                                        By default empty. 
     \endtable    
     
-    The environment variables for \c make can be given as an parameters. For example:
-    
-    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3    
-    
-    The above example is identical to:
+    For example:
     
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 4        
+
+    The environment variables for \c make can also be given as parameters:
+    
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3        
     
     If you want to install the program immediately, make sure that the device
     is connected to the computer in "PC Suite" mode, and run \c sis target