From 9089b3acbd17f2d011f9a4045b12116e4a469067 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 5 Oct 2017 08:16:34 +0200 Subject: [PATCH] Debugger: Only set cppEngine if there's any C++ debugging Fixes a regression introduced yesterday with 58a69c461aac0. Change-Id: I9eea3d0adf45e2b65b7d395280ae0e0fbbe01127 Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggerruncontrol.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 01e25c98008..cd825ca6861 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -474,7 +474,7 @@ void DebuggerRunTool::start() cppEngine = createPdbEngine(); break; default: - QTC_CHECK(false); + // Can happen for pure Qml. break; } @@ -720,7 +720,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit) kit = runConfig->target()->kit(); QTC_ASSERT(kit, return); - m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit); m_runParameters.sysRoot = SysRootKitInformation::sysRoot(kit).toString(); m_runParameters.macroExpander = kit->macroExpander(); m_runParameters.debugger = DebuggerKitInformation::runnable(kit); @@ -740,6 +739,9 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit) m_runParameters.multiProcess = aspect->useMultiProcess(); } + if (m_runParameters.isCppDebugging) + m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit); + const QByteArray envBinary = qgetenv("QTC_DEBUGGER_PATH"); if (!envBinary.isEmpty()) m_runParameters.debugger.executable = QString::fromLocal8Bit(envBinary);