From de100a4addea1fc16d0e700b9c8c4b9d1362cd56 Mon Sep 17 00:00:00 2001 From: Kai Koehne <kai.koehne@nokia.com> Date: Thu, 16 Feb 2012 13:10:46 +0100 Subject: [PATCH] QmlProject: Fix debugging Don't always use the mixed engine for debugging of .qmlprojects. This is a regression from fix fe8cead2d004e5a571. Change-Id: I589cb0610d40edc4fbd29897374d83504e574cb5 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> --- src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 4b19b83e3e4..49339fdf73c 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -216,6 +216,11 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf params.displayName = runConfig->displayName(); params.projectSourceDirectory = runConfig->target()->project()->projectDirectory(); params.projectSourceFiles = runConfig->target()->project()->files(Project::ExcludeGeneratedFiles); + if (runConfig->useQmlDebugger()) + params.languages |= Debugger::QmlLanguage; + if (runConfig->useCppDebugger()) + params.languages |= Debugger::CppLanguage; + if (!runConfig->qtVersion()->qtAbis().isEmpty()) params.toolChainAbi = runConfig->qtVersion()->qtAbis().first(); -- GitLab