From 7293c01210858ed19be646cbb6039b33301105e4 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 22 Jun 2017 14:02:56 +0200
Subject: [PATCH] Debugger: Fix inappropriate debugger warning when using mixed
 debugging

Change-Id: I3fb1818e36d01f69cca6ad07653afdc49bda702e
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/debugger/debuggerengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 674d9d42aa7..b71ab3f320b 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"