From 122bd50144e0dc016808779e3ec88b6cb11e2d06 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 24 May 2013 16:10:14 +0200 Subject: Debugger: Check start parameter languages for engine type Change-Id: If5a05d12e7597516510d5726ca6d3418b3393251 Reviewed-by: Kai Koehne --- src/plugins/debugger/debuggerrunner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index cac11d0ff7..080a060d29 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -574,8 +574,8 @@ static bool fixupEngineTypes(DebuggerStartParameters &sp, RunConfiguration *rc, if (const Target *target = rc->target()) if (!fillParameters(&sp, target->kit(), errorMessage)) return false; - const bool useCppDebugger = aspect->useCppDebugger(); - const bool useQmlDebugger = aspect->useQmlDebugger(); + const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage); + const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage); if (useQmlDebugger) { if (useCppDebugger) { sp.masterEngineType = QmlCppEngineType; -- cgit v1.2.3