feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: prefer cdb for msvc targets

Browse Source 
Change-Id: I4d305ae6f3b54d7f724f2cfbde6062663e3c0ad1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-10-30 13:53:13 +01:00
parent b2ede6ff51
commit 6fc24653b8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggeritem.cpp
View File

@@ -381,6 +381,11 @@ static DebuggerItem::MatchLevel matchSingle(const Abi &debuggerAbi, const Abi &t
return DebuggerItem::DoesNotMatch; return DebuggerItem::DoesNotMatch;
// We have at least 'Matches well' now. Mark the combinations we really like. // We have at least 'Matches well' now. Mark the combinations we really like.
if (HostOsInfo::isWindowsHost() && engineType == CdbEngineType
&& targetAbi.osFlavor() >= Abi::WindowsMsvc2005Flavor
&& targetAbi.osFlavor() <= Abi::WindowsLastMsvcFlavor) {
return DebuggerItem::MatchesPerfectly;
}
if (HostOsInfo::isWindowsHost() && engineType == GdbEngineType && targetAbi.osFlavor() == Abi::WindowsMSysFlavor) if (HostOsInfo::isWindowsHost() && engineType == GdbEngineType && targetAbi.osFlavor() == Abi::WindowsMSysFlavor)
return DebuggerItem::MatchesPerfectly; return DebuggerItem::MatchesPerfectly;
if (HostOsInfo::isLinuxHost() && engineType == GdbEngineType && targetAbi.os() == Abi::LinuxOS) if (HostOsInfo::isLinuxHost() && engineType == GdbEngineType && targetAbi.os() == Abi::LinuxOS)

1
src/plugins/projectexplorer/abi.h
View File

@@ -97,6 +97,7 @@ public:
WindowsMsvc2015Flavor, WindowsMsvc2015Flavor,
WindowsMsvc2017Flavor, WindowsMsvc2017Flavor,
WindowsMsvc2019Flavor, WindowsMsvc2019Flavor,
WindowsLastMsvcFlavor = WindowsMsvc2019Flavor,
WindowsMSysFlavor, WindowsMSysFlavor,
WindowsCEFlavor, WindowsCEFlavor,