diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-15 12:24:51 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-15 12:24:51 (GMT) |
| commit | 4f46562b01cc068cd940281f71061386d7f4ecc3 (patch) | |
| tree | 523fa14f5f8b5c3a66464494425661be6f2c5d99 /doc/src/deployment/deployment.qdoc | |
| parent | 1637d135906296b2a32f17ed20c86869dc1667e8 (diff) | |
| parent | e7b372e4705451dfd4443db7e6fc64d4b8f30c68 (diff) | |
| download | Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.zip Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.tar.gz Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/deployment/deployment.qdoc')
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 664f002..c078316 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -756,6 +756,7 @@ \snippet doc/src/snippets/code/doc_src_deployment.qdoc 21 to your .pro file. The \c embed_manifest_dll option is enabled by default. + The \c embed_manifest_exe option is NOT enabled by default. You can find more information about manifest files and side-by-side assemblies at the |