diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-11 23:00:16 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-11 23:00:16 (GMT) |
| commit | 1d958d22de979c90e4b41b32152cce6d29abb46f (patch) | |
| tree | a88db4e400c443e618e476b7e13f646057555a0f | |
| parent | d6e0a50e443f869c4ced17453f0ea269a86ca453 (diff) | |
| parent | df0a5f6be0469858671500f0614295825559f28d (diff) | |
| download | Qt-1d958d22de979c90e4b41b32152cce6d29abb46f.zip Qt-1d958d22de979c90e4b41b32152cce6d29abb46f.tar.gz Qt-1d958d22de979c90e4b41b32152cce6d29abb46f.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 47219bf..a359787 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -746,7 +746,7 @@ If the shared library has dependencies that are different from the application using it, the manifest file needs to be embedded into the DLL - binary. Since Qt 4.1.3, the follwoing \c CONFIG options are available for + binary. Since Qt 4.1.3, the following \c CONFIG options are available for embedding manifests: \snippet doc/src/snippets/code/doc_src_deployment.qdoc 20 |