diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-08-30 15:55:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-01 12:51:45 +0200 |
| commit | e2e0db687efd9b269d3f042d1a6d722f59a840e4 (patch) | |
| tree | 861cb32254467af1abc7df94b8811df21dde3eaf | |
| parent | 81f93c1d404687c6aad3a267c397264455615472 (diff) | |
| download | qt-creator-e2e0db687efd9b269d3f042d1a6d722f59a840e4.tar.gz | |
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 <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 8c0ebf370a..a9f255807b 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! |