summaryrefslogtreecommitdiffstats
path: root/doc/src/getting-started
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-01-20 16:48:45 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-01-20 16:48:45 (GMT)
commited760b619ed0748d1428b9f08b785913883b560c (patch)
tree1afc57deb86fa711c54ce53c987d7f612a6f7574 /doc/src/getting-started
parentc3637e53cb4e4d64a60664874f15292982acbdbd (diff)
parent304c70a03406eb16b9a08719769655b75bf6d8e3 (diff)
downloadQt-ed760b619ed0748d1428b9f08b785913883b560c.zip
Qt-ed760b619ed0748d1428b9f08b785913883b560c.tar.gz
Qt-ed760b619ed0748d1428b9f08b785913883b560c.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/getting-started')
-rw-r--r--doc/src/getting-started/installation.qdoc33
1 files changed, 27 insertions, 6 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3867b3b..5f95c5a 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: