AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake/msbuild: Support all /DEBUG:xxx linker options

Browse Source 
/DEBUG:OFF now turns debug info generation off.
/DEBUG:FULL maps to DebugFull.
Unknown /DEBUG:xxx options are added to AdditionalOptions.

Pick-to: 5.15 6.2 6.3 6.4
Task-number: QTBUG-104450
Change-Id: Ibd072145e51551b29370e809b880c0d7f1a00c03
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2022-06-21 14:47:42 +02:00
parent 566ede6ee1
commit 6a6b27940d
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -1099,6 +1099,8 @@ static inline QString toString(triState genDebugInfo, linkerDebugOption option)
case _True: case _True:
if (option == linkerDebugOptionFastLink) if (option == linkerDebugOptionFastLink)
return "DebugFastLink"; return "DebugFastLink";
else if (option == linkerDebugOptionFull)
return "DebugFull";
return "true"; return "true";
} }
return QString(); return QString();

20
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -1477,10 +1477,22 @@ bool VCLinkerTool::parseOption(const char* option)
}else }else
EnableUAC = _True; EnableUAC = _True;
break; break;
case 0x3389797: // /DEBUG[:FASTLINK] case 0x3389797: // /DEBUG[:{FASTLINK|FULL|NONE}]
GenerateDebugInformation = _True; if (config->CompilerVersion >= NET2015) {
if (config->CompilerVersion >= NET2015 && strcmp(option + 7, "FASTLINK") == 0) const char *str = option + 7;
DebugInfoOption = linkerDebugOptionFastLink; if (qstricmp(str, "fastlink") == 0)
DebugInfoOption = linkerDebugOptionFastLink;
else if (qstricmp(str, "full") == 0)
DebugInfoOption = linkerDebugOptionFull;
else if (qstricmp(str, "none") == 0)
DebugInfoOption = linkerDebugOptionNone;
else
AdditionalOptions += option;
}
if (DebugInfoOption == linkerDebugOptionNone)
GenerateDebugInformation = _False;
else
GenerateDebugInformation = _True;
break; break;
case 0x0033896: // /DEF:filename case 0x0033896: // /DEF:filename
ModuleDefinitionFile = option+5; ModuleDefinitionFile = option+5;

3
qmake/generators/win32/msvc_objectmodel.h
View File

@ -258,7 +258,8 @@ enum inlineExpansionOption {
}; };
enum linkerDebugOption { enum linkerDebugOption {
linkerDebugOptionNone, linkerDebugOptionNone,
linkerDebugOptionFastLink linkerDebugOptionFastLink,
linkerDebugOptionFull
}; };
enum linkIncrementalType { enum linkIncrementalType {
linkIncrementalDefault, linkIncrementalDefault,