summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2020-05-04 16:51:01 +0800
committerYuhang Zhao <2546789017@qq.com>2020-05-12 07:35:32 +0800
commitfc1e5d9877c06f974401cbf0f2468c8bba81edff (patch)
treea7dbe56035809b6bd01a67af03aa65b23eb56c5e /qmake
parent737635fa56f5e4f50dabb495a5b8087e908b4713 (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>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/winmakefile.cpp4
1 files changed, 2 insertions, 2 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";