diff options
author | Liang Qi <liang.qi@nokia.com> | 2011-07-14 09:15:55 (GMT) |
---|---|---|
committer | Liang Qi <liang.qi@nokia.com> | 2011-07-14 09:15:55 (GMT) |
commit | 88d6bf04e01f4f006ed2708851e925d59012d591 (patch) | |
tree | 0fbd062191d966b7d2d1cc59dcafb9631e02b71f /doc/src/deployment | |
parent | 80b91ac5f579b5cc310366fb0ea4aa4c813c04bf (diff) | |
parent | 6827ea5e97c9f6540f0fae5236f89343c32f4cb8 (diff) | |
download | Qt-88d6bf04e01f4f006ed2708851e925d59012d591.zip Qt-88d6bf04e01f4f006ed2708851e925d59012d591.tar.gz Qt-88d6bf04e01f4f006ed2708851e925d59012d591.tar.bz2 |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'doc/src/deployment')
-rw-r--r-- | doc/src/deployment/deployment.qdoc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index a359787..a13e2b8 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -1555,15 +1555,4 @@ For more information about creating a \c .sis file and installing it to device see also \l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}. - - \section1 Further Reading - - This document aims to cover the common case for developers who want to - deploy Qt applications on devices using the Smart Installer. It does not - aim to cover every possible way of installing applications, Qt and other - dependencies on a device. - - A wider selection of deployment methods is described in the - \l{Deploying a Qt Application article} on the Symbian Foundation - Developer Wiki. */ |