summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/mingw_make.h
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2020-05-04 16:35:22 +0800
committerYuhang Zhao <2546789017@qq.com>2020-05-11 21:23:18 +0800
commitef8640596c77dfd25ac0fe790bf265e581da29b1 (patch)
tree28296f104d050624c3e1c7a69ca220a330095c88 /qmake/generators/win32/mingw_make.h
parenta1ccedeb440216dce87fad01746935a89fd8715e (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/mingw_make.h')
-rw-r--r--qmake/generators/win32/mingw_make.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 8cae28a78b..6ab1c95a94 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -41,7 +41,6 @@ protected:
ProString fixLibFlag(const ProString &lib) override;
bool processPrlFileBase(QString &origFile, const QStringRef &origName,
const QStringRef &fixedBase, int slashOff) override;
- QString getManifestFileForRcFile() const override;
bool writeMakefile(QTextStream &) override;
void init() override;
QString installRoot() const override;