diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-25 11:38:02 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-25 15:30:04 +0000 |
| commit | 276cd0b56c7de073b048c0d263b03576add94ed5 (patch) | |
| tree | 5137837e03bf68d3f80d4beaf2d4000133a348c5 | |
| parent | 12dd16ce1990e8a6046172c13ad089b35f7d048f (diff) | |
| download | qtdoc-276cd0b56c7de073b048c0d263b03576add94ed5.tar.gz | |
Doc: Correct claim about embed_manifest_exe qmake option
Change-Id: I67c239214bcb74d04677e9ad5fe864bb63b7c169
Task-number: QTBUG-50631
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.pro | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 03fc8368..ac9f0c42 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -845,12 +845,11 @@ \snippet snippets/code/doc_src_deployment.qdoc 20 - To use the options, add + Both options are enabled by default. To remove \c{embed_manifest_exe}, add \snippet snippets/code/doc_src_deployment.pro 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. + to your .pro file. You can find more information about manifest files and side-by-side assemblies at the diff --git a/doc/src/snippets/code/doc_src_deployment.pro b/doc/src/snippets/code/doc_src_deployment.pro index 0dd6b78c..03112145 100644 --- a/doc/src/snippets/code/doc_src_deployment.pro +++ b/doc/src/snippets/code/doc_src_deployment.pro @@ -44,7 +44,7 @@ DESTDIR = /path/to/Qt/plugandpaint/plugins #! [21] -CONFIG += embed_manifest_exe +CONFIG -= embed_manifest_exe #! [21] |