diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2020-05-04 16:35:22 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2020-05-11 21:23:18 +0800 |
| commit | ef8640596c77dfd25ac0fe790bf265e581da29b1 (patch) | |
| tree | 28296f104d050624c3e1c7a69ca220a330095c88 /qmake/doc | |
| parent | a1ccedeb440216dce87fad01746935a89fd8715e (diff) | |
qmake: Fix handling of manifest file of msvc
Setting the QMAKE_MANIFEST variable doesn't have
any effect for MSVC. This commit fixes that.
If the developer is setting this variable,
he/she will definitely use CONFIG-=embed_manifest_exe
or CONFIG-=embed_manifest_dll at the same time,
so I think there is no need to check this.
Change-Id: Ie32b7e0cded71efcf14bf4c0eecab5ab1944fa2c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index bf496e38f5..bcda88ad8f 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -796,8 +796,8 @@ variables \l{QMAKE_TARGET_COMPANY}, \l{QMAKE_TARGET_DESCRIPTION}, \l{QMAKE_TARGET_COPYRIGHT}, \l{QMAKE_TARGET_PRODUCT}, \l{QMAKE_TARGET_ORIGINAL_FILENAME}, \l{QMAKE_TARGET_INTERNALNAME}, - \l{QMAKE_TARGET_COMMENTS}, \l{QMAKE_TARGET_TRADEMARKS}, \l{RC_CODEPAGE}, - \l{RC_ICONS}, \l{RC_LANG} and \l{VERSION}. + \l{QMAKE_TARGET_COMMENTS}, \l{QMAKE_TARGET_TRADEMARKS}, \l{QMAKE_MANIFEST}, + \l{RC_CODEPAGE}, \l{RC_ICONS}, \l{RC_LANG} and \l{VERSION}. If these elements are not sufficient, qmake has the two system variables \l{RC_FILE} and \l{RES_FILE} that point directly to an externally created @@ -2784,6 +2784,14 @@ \l{RC_ICONS} variable is set and the \l{RC_FILE} and \l{RES_FILE} variables are not set. + \target QMAKE_MANIFEST + \section1 QMAKE_MANIFEST + + Windows only. Specifies the manifest file for the project target. + This is only utilized if the \l{RC_FILE} and \l{RES_FILE} variables are not set. + Don't forget to remove embed_manifest_exe and embed_manifest_dll from + the CONFIG variable, otherwise it will conflict with the compiler generated one. + \section1 QMAKE_TVOS_DEPLOYMENT_TARGET \note This variable is used on the tvOS platform only. |