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/generators/win32/winmakefile.h | |
| 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/generators/win32/winmakefile.h')
| -rw-r--r-- | qmake/generators/win32/winmakefile.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h index 09984fe355..265e54204e 100644 --- a/qmake/generators/win32/winmakefile.h +++ b/qmake/generators/win32/winmakefile.h @@ -63,7 +63,6 @@ protected: void fixTargetExt(); void processRcFileVar(); static QString cQuoted(const QString &str); - virtual QString getManifestFileForRcFile() const; public: ProKey fullTargetVariable() const override; |