summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-04-01 14:38:15 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-04-01 16:09:34 (GMT)
commit3ffcbdcfe10e7ef6eec1135a449b91a55e0b2bb6 (patch)
tree6e85e9e188d65493ea3289432a840ca9e537021d /doc
parent6869506819aa705fab4d20e8f683bc75e1d2f5c2 (diff)
downloadQt-3ffcbdcfe10e7ef6eec1135a449b91a55e0b2bb6.zip
Qt-3ffcbdcfe10e7ef6eec1135a449b91a55e0b2bb6.tar.gz
Qt-3ffcbdcfe10e7ef6eec1135a449b91a55e0b2bb6.tar.bz2
Doc: Updated the deployment documentation with the QtScriptTools module and references to Phonon documentation.
Task-number: 212939 Reviewed-by: TrustMe
Diffstat (limited to 'doc')
-rw-r--r--doc/src/deployment.qdoc13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
index 7e02f1a..d9f7c1a 100644
--- a/doc/src/deployment.qdoc
+++ b/doc/src/deployment.qdoc
@@ -91,7 +91,7 @@
The disadvantage with the shared library approach is that you
will get more files to deploy. For more information, see
\l{sharedlibrary.html}{Creating Shared Libraries}.
-
+
\section1 Deploying Qt's Libraries
\table
@@ -111,13 +111,14 @@
\o \l {QtNetwork}
\o \l {QtOpenGL}
\o \l {QtScript}
- \o \l {QtSql}
+ \o \l {QtScriptTools}
\row
+ \o \l {QtSql}
\o \l {QtSvg}
\o \l {QtWebKit}
\o \l {QtXml}
- \o \l {QtXmlPatterns}
\row
+ \o \l {QtXmlPatterns}
\o \l {Phonon Module}{Phonon}
\o \l {Qt3Support}
\endtable
@@ -178,11 +179,13 @@
Please see \l{QtWebKit Module#License Information}{the QtWebKit module
documentation} for more information.
- \row \o Phonon \o Phonon
+ \row \o \l{Phonon Module}{Phonon} \o Phonon
\o Phonon relies on the native multimedia engines on different platforms.
Phonon itself is licensed under the GNU LGPL version 2. Please see
\l{Phonon Module#License Information}{the Phonon module documentation}
- for more information.
+ for more information on licensing and the
+ \l{Phonon Overview#Backends}{Phonon Overview} for details of the backends
+ in use on different platforms.
\endtable
\section1 Platform-Specific Notes