Updated sis file names and related content in Symbian installation docs

Task-number: QTBUG-6348
Reviewed-by: Janne Koskinen
(cherry picked from commit 44f7b73940c67b8e81f52dfc6370453ff07d3aa2)

2 files changed, 24 insertions, 12 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 49463b7..911a379 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -511,19 +511,27 @@ in the \l{Qt for the Symbian platform Requirements} document.
         \note Qt must be installed on the same drive as the Symbian SDK you are
         using, and the install path must not contain any spaces.
 
+    \o  Install Qt into a device
+
+        To run Qt applications on a device, \c{qt_installer.sis} found
+        in the Qt installation directory must be first installed into the device.
+        \c{Qt_installer.sis} contains Qt libraries and Open C libraries all in one
+        convenient package.
+        Begin installation by connecting your device via USB cable to a computer that
+        has the \l{http://www.nokia.com/pcsuite}{Nokia PC Suite} installed.
+        On the device, select "PC Suite mode". In Windows Explorer right click
+        on the \c{qt_installer.sis} file, select "Install with Nokia Application
+        Installer" and follow the instructions.
+
     \o  Running Qt demos
 
         We've included a subset of the Qt demos in this package for you
         to try out. An excellent starting point is the "fluidlauncher"
-        demo. To run the demo on a real device, you first have to install
-        \c{qt.sis} and \c{fluidlauncher.sis} found in the Qt installation
-        directory. Also, check if the device needs additional
-        \l{Qt for the Symbian platform Requirements}{requirements}.
-        Begin by connecting your device via USB cable to a computer that has
-        the \l{http://www.nokia.com/pcsuite}{Nokia PC Suite} installed.
-        On the device, select "PC Suite mode". In Windows Explorer right click
-        on the \c{.sis} files, select "Install with Nokia Application Installer"
-        and follow the instructions.
+        demo.
+
+        To run the demo on a real device, install \c{fluidlauncher.sis}
+        found in the Qt installation directory to a device that already has Qt installed.
+        After installation, you can find fluidlauncher in the applications folder of the device.
 
         To run the demos and examples on the emulator, you need to build them first.
         Open the "Qt for the Symbian platform Command Prompt" from the Start menu and type:
@@ -1013,15 +1021,17 @@ If you are using pre-built binaries, follow the instructions given in the
            which is not available free of charge.
     \endlist
 
-    Running Qt on real device requires the following packages to be installed on your device.
-    The packages can be found in the Symbian SDK where you installed Open C/C++:
+    Running Qt on real device requires the Open C to be installed on the device.
+    The Open C installation packages are embedded into \c{qt_installer.sis}, which is included in
+    Qt for Symbian binary package. If you are building Qt from scratch, you can find the
+    required packages in the Symbian SDK where you installed Open C/C++:
     \list
         \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis}
         \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis}
         \o \c{nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis}
     \endlist
 
-    We recommend you to take a look of  \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start}
+    We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start}
     to get more information about how to setup the development environment.
 
     \sa {Known Issues in %VERSION%}
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 6956cab..251dcac 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -198,6 +198,8 @@ make release-armv5
 //! [29]
 cd src\s60installs
 make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file>
+cd ..\3rdparty\webkit\WebCore
+make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file>
 //! [29]
 
 //! [30]