Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

4 files changed, 47 insertions, 8 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3867b3b89c..5f95c5a357 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -640,17 +640,38 @@ If you are using pre-built binaries, follow the instructions given in the
 
         Congratulations, Qt is now ready to use.
 
-    \o  Running Qt demos
+    \o  Installing Qt libraries on the device
 
-        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
+        To run the demo on a real device, you first have to install
         the Qt libraries on the device:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
 
-        \note You will need to supply certificate that allows installation
-        of binaries with "All -Tcb" capability to your device.
+        The Qt libraries are built with "All -Tcb" capability, so that
+        they can support all types of application.
+        If you don't have a suitable certificate, it is possible to patch
+        the binaries as follows:
+
+    \list A
+        \o Installing Qt without a certificate
+
+            If you have no certificate, build a self signed Qt:
+
+            \snippet doc/src/snippets/code/doc_src_installation.qdoc 34
+
+        \o Installing Qt with a Symbian developer certificate
+
+            If you have a symbian-signed developer certificate, specify the
+            capabilities you can sign for, for example:
+
+            \snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+    \endlist
+
+    \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.
 
         Similarly, install fluidlauncher to the device:
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 298e0beffe..44d6ed6088 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -1046,7 +1046,7 @@
     distributed under the following license.
     
     \legalese
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+    Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     All rights reserved.\br
     Contact: Nokia Corporation (qt-info@nokia.com)
 
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 7680ec80cf..b3c99038ff 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -222,3 +222,21 @@ abld build gcce urel
 //! [33]
 SYMBIANBUILD_DEPENDENCYOFF=1
 //! [33]
+
+//! [34]
+cd src\s60installs
+patch_capabilities.pl Qt_template.pkg release-armv5
+make sis QT_SIS_OPTIONS=-i
+cd ..\3rdparty\webkit\WebCore
+patch_capabilities.pl QtWebkit_template.pkg release-armv5
+make sis QT_SIS_OPTIONS=-i
+//! [34]
+
+//! [35]
+cd src\s60installs
+patch_capabilities.pl Qt_template.pkg release-armv5 "ALL -Tcb -AllFiles -DRM"
+make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file>
+cd ..\3rdparty\webkit\WebCore
+patch_capabilities.pl QtWebKit_template.pkg release-armv5 "ALL -Tcb -AllFiles -DRM"
+make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file>
+//! [35]
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
index 629586ee05..3be504ce04 100644
--- a/doc/src/snippets/qstring/main.cpp
+++ b/doc/src/snippets/qstring/main.cpp
@@ -802,7 +802,7 @@ void Widget::toLowerFunction()
 {
 //! [75]
     QString str = "Qt by NOKIA";
-    str = str.toLower();        // str == "qy by nokia"
+    str = str.toLower();        // str == "qt by nokia"
 //! [75]
 }