diff options
author | Yuhang Zhao <2546789017@qq.com> | 2020-05-04 16:51:01 +0800 |
---|---|---|
committer | Yuhang Zhao <2546789017@qq.com> | 2020-05-12 07:35:32 +0800 |
commit | fc1e5d9877c06f974401cbf0f2468c8bba81edff (patch) | |
tree | a7dbe56035809b6bd01a67af03aa65b23eb56c5e | |
parent | 737635fa56f5e4f50dabb495a5b8087e908b4713 (diff) |
qmake: Update the macro names
I generated a rc file using VS2019 and I found that it's
using other macros.
According to [1], both of VOS_NT_WINDOWS32 and VOS__WINDOWS32 refers to
"File was designed for 32-bit Windows", although they have different
values, and 0x0L is the value of VFT2_UNKNOWN. So I think it's safe to
update them. VS2019 is using them as the default template for rc files,
after all.
[1] https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
Change-Id: Ibaf91394668844492f1357da05b881b9d81aa15f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 4 | ||||
-rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 85cc1ffd8a..b892b69922 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -386,12 +386,12 @@ void Win32MakefileGenerator::processRcFileVar() ts << "#else\n"; ts << "\tFILEFLAGS 0x0L\n"; ts << "#endif\n"; - ts << "\tFILEOS VOS__WINDOWS32\n"; + ts << "\tFILEOS VOS_NT_WINDOWS32\n"; if (project->isActiveConfig("shared")) ts << "\tFILETYPE VFT_DLL\n"; else ts << "\tFILETYPE VFT_APP\n"; - ts << "\tFILESUBTYPE 0x0L\n"; + ts << "\tFILESUBTYPE VFT2_UNKNOWN\n"; ts << "\tBEGIN\n"; ts << "\t\tBLOCK \"StringFileInfo\"\n"; ts << "\t\tBEGIN\n"; diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index e5c40e9243..baf727fa09 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -914,9 +914,9 @@ FILEFLAGSMASK 0x3fL #else FILEFLAGS 0x0L #endif -FILEOS VOS__WINDOWS32 +FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL -FILESUBTYPE 0x0L +FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK \"StringFileInfo\" BEGIN |