summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/breakwindow.cpp
diff options
context:
space:
mode:
authorAurindam Jana <aurindam.jana@nokia.com>2011-10-10 15:25:18 +0200
committerAurindam Jana <aurindam.jana@nokia.com>2011-10-11 11:25:34 +0200
commit32ef6c563d41623956e2419d149e9f83ce422394 (patch)
treee83b81bfd7d390150acaf55eb8e07ebfdf72b621 /src/plugins/debugger/breakwindow.cpp
parentf1db83be8be50b48ac1db80640b66e7f2b67d4c1 (diff)
downloadqt-creator-32ef6c563d41623956e2419d149e9f83ce422394.tar.gz
V8DebuggerClient: Enable breakpoints on Exceptions
Previously break on exceptions was always enabled. Now, the user can add a breakpoint on Javascript Exceptions from the breakpoint window in the debugger. Change-Id: Ia9ee813d2fccf89b607fe1dcbad47b4084155a48 Reviewed-on: http://codereview.qt-project.org/6348 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/plugins/debugger/breakwindow.cpp')
-rw-r--r--src/plugins/debugger/breakwindow.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 7739491d30..ed8177d3b3 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -120,9 +120,10 @@ BreakpointDialog::BreakpointDialog(unsigned engineCapabilities, QWidget *parent)
<< tr("Break when a system call is executed")
<< tr("Break on data access at fixed address")
<< tr("Break on data access at address given by expression")
- << tr("Break on QML signal handler");
+ << tr("Break on QML signal handler")
+ << tr("Break when JavaScript exception is thrown");
- QTC_ASSERT(types.size() == BreakpointOnQmlSignalHandler, return; )
+ QTC_ASSERT(types.size() == BreakpointAtJavaScriptThrow, return; )
m_ui.comboBoxType->addItems(types);
m_ui.pathChooserFileName->setExpectedKind(Utils::PathChooser::File);
connect(m_ui.comboBoxType, SIGNAL(activated(int)), SLOT(typeChanged(int)));
@@ -352,6 +353,7 @@ void BreakpointDialog::typeChanged(int)
case BreakpointAtExec:
//case BreakpointAtVFork:
case BreakpointAtSysCall:
+ case BreakpointAtJavaScriptThrow:
break;
case BreakpointByAddress:
case WatchpointAtAddress:
@@ -384,6 +386,7 @@ void BreakpointDialog::typeChanged(int)
case BreakpointAtExec:
//case BreakpointAtVFork:
case BreakpointAtSysCall:
+ case BreakpointAtJavaScriptThrow:
clearOtherParts(AllConditionParts|ModulePart|TracePointPart);
setPartsEnabled(AllConditionParts|TracePointPart);
break;