summaryrefslogtreecommitdiff
path: root/src/plugins/debugger
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2017-06-22 14:02:56 +0200
committerDavid Schulz <david.schulz@qt.io>2017-06-23 05:25:54 +0000
commit7293c01210858ed19be646cbb6039b33301105e4 (patch)
treeb0ef2e2e64e9d3a007a9daa0b056a0247c11170c /src/plugins/debugger
parentffc97df7a6c3add7820c08c1614d27d10a82a0d6 (diff)
downloadqt-creator-7293c01210858ed19be646cbb6039b33301105e4.tar.gz
Debugger: Fix inappropriate debugger warning when using mixed debugging
Change-Id: I3fb1818e36d01f69cca6ad07653afdc49bda702e Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/debugger')
-rw-r--r--src/plugins/debugger/debuggerengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 674d9d42aa..b71ab3f320 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1796,7 +1796,7 @@ void DebuggerEngine::validateExecutable()
QString detailedWarning;
switch (sp->toolChainAbi.binaryFormat()) {
case Abi::PEFormat: {
- if (sp->masterEngineType != CdbEngineType) {
+ if (sp->cppEngineType != CdbEngineType) {
warnOnInappropriateDebugger = true;
detailedWarning = tr(
"The inferior is in the Portable Executable format.\n"
@@ -1820,7 +1820,7 @@ void DebuggerEngine::validateExecutable()
break;
}
case Abi::ElfFormat: {
- if (sp->masterEngineType == CdbEngineType) {
+ if (sp->cppEngineType == CdbEngineType) {
warnOnInappropriateDebugger = true;
detailedWarning = tr(
"The inferior is in the ELF format.\n"