From e2e0db687efd9b269d3f042d1a6d722f59a840e4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 30 Aug 2011 15:55:44 +0200 Subject: [PATCH] QmlProject: Fix debugging with C++ language Because no ABI was specified, gdb bailed out with 'File format not recognized'. Instead just use the ABI from one of the toolchains available for the Qt version (assuming that they're all compatible). Task-number: QTCREATORBUG-5957 Change-Id: I7db9bd45c6a015c6236ae1b672909e013fad1d65 Reviewed-by: Tobias Hunger Reviewed-on: http://codereview.qt.nokia.com/4045 Reviewed-by: Qt Sanity Bot Reviewed-by: Eike Ziller --- src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 8c0ebf370ae..a9f255807b3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -206,6 +206,8 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf params.displayName = runConfig->displayName(); params.projectSourceDirectory = runConfig->target()->project()->projectDirectory(); params.projectSourceFiles = runConfig->target()->project()->files(Project::ExcludeGeneratedFiles); + if (!runConfig->qtVersion()->qtAbis().isEmpty()) + params.toolChainAbi = runConfig->qtVersion()->qtAbis().first(); // Makes sure that all bindings go through the JavaScript engine, so that // breakpoints are actually hit!