diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-14 09:35:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-14 09:35:11 (GMT) |
| commit | 58568e9d887460c8be59656bc5aa56dd766cfa4e (patch) | |
| tree | 0fbd062191d966b7d2d1cc59dcafb9631e02b71f /doc/src | |
| parent | 80b91ac5f579b5cc310366fb0ea4aa4c813c04bf (diff) | |
| parent | 88d6bf04e01f4f006ed2708851e925d59012d591 (diff) | |
| download | Qt-58568e9d887460c8be59656bc5aa56dd766cfa4e.zip Qt-58568e9d887460c8be59656bc5aa56dd766cfa4e.tar.gz Qt-58568e9d887460c8be59656bc5aa56dd766cfa4e.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix potential crash when clicking in a text edit
Compensate for different rounding rule in CG engine
Remove broken link to Symbian.org documentation.
Check engine existence before increasing reference count
Keep reference count for cached font engines in QTextEngine
Optimize text layout.
Fix crash when app font is added
Backporting fix for QTBUG-18716
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 11 | ||||
| -rw-r--r-- | doc/src/external-resources.qdoc | 5 |
2 files changed, 0 insertions, 16 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. */ diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 63e11c8..f528bf2 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -425,11 +425,6 @@ */ /*! - \externalpage http://developer.symbian.org/wiki/index.php/Deploying_a_Qt_Application - \title Deploying a Qt Application article -*/ - -/*! \externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm \title ECMAScript Language Specification */ |