1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: Update the macro names

Browse Source 
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>
This commit is contained in:
Yuhang Zhao 2020-05-04 16:51:01 +08:00
parent 737635fa56
commit fc1e5d9877
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/win32/winmakefile.cpp
View File

@ -386,12 +386,12 @@ void Win32MakefileGenerator::processRcFileVar()
ts << "#else\n"; ts << "#else\n";
ts << "\tFILEFLAGS 0x0L\n"; ts << "\tFILEFLAGS 0x0L\n";
ts << "#endif\n"; ts << "#endif\n";
ts << "\tFILEOS VOS__WINDOWS32\n"; ts << "\tFILEOS VOS_NT_WINDOWS32\n";
if (project->isActiveConfig("shared")) if (project->isActiveConfig("shared"))
ts << "\tFILETYPE VFT_DLL\n"; ts << "\tFILETYPE VFT_DLL\n";
else else
ts << "\tFILETYPE VFT_APP\n"; ts << "\tFILETYPE VFT_APP\n";
ts << "\tFILESUBTYPE 0x0L\n"; ts << "\tFILESUBTYPE VFT2_UNKNOWN\n";
ts << "\tBEGIN\n"; ts << "\tBEGIN\n";
ts << "\t\tBLOCK \"StringFileInfo\"\n"; ts << "\t\tBLOCK \"StringFileInfo\"\n";
ts << "\t\tBEGIN\n"; ts << "\t\tBEGIN\n";

4
src/corelib/Qt6CoreMacros.cmake
View File

@ -914,9 +914,9 @@ FILEFLAGSMASK 0x3fL
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS__WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE VFT2_UNKNOWN
BEGIN BEGIN
BLOCK \"StringFileInfo\" BLOCK \"StringFileInfo\"
BEGIN BEGIN