From bcd2146db177ff62cb4ae5e30c43dbc33be5ae75 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 7 Jul 2010 13:26:32 +0200
Subject: [PATCH] debugger: don't stop at disabled breakpoints in script engine
---
src/plugins/debugger/breakhandler.cpp | 16 ++++++++--------
src/plugins/debugger/script/scriptengine.cpp | 12 +++++++++---
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 931ab27dec9..a8841260b60 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -742,14 +742,14 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
case BreakpointEnabledRole:
if (data->enabled != value.toBool()) {
toggleBreakpointEnabled(data);
- layoutChanged();
+ emit layoutChanged();
}
return true;
case BreakpointUseFullPathRole:
if (data->useFullPath != value.toBool()) {
data->useFullPath = value.toBool();
- layoutChanged();
+ emit layoutChanged();
}
return true;
@@ -757,21 +757,21 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
QString val = value.toString();
if (data->funcName != val) {
data->funcName = val;
- layoutChanged();
+ emit layoutChanged();
}
return true;
QString val = value.toString();
if (data->fileName != val) {
data->fileName = val;
- layoutChanged();
+ emit layoutChanged();
}
return true;
QByteArray val = value.toString().toLatin1();
if (data->lineNumber != val) {
data->lineNumber = val;
- layoutChanged();
+ emit layoutChanged();
}
return true;
*/
@@ -779,7 +779,7 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
QByteArray val = value.toString().toLatin1();
if (val != data->condition) {
data->condition = val;
- layoutChanged();
+ emit layoutChanged();
}
}
return true;
@@ -788,7 +788,7 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
QByteArray val = value.toString().toLatin1();
if (val != data->ignoreCount) {
data->ignoreCount = val;
- layoutChanged();
+ emit layoutChanged();
}
}
return true;
@@ -797,7 +797,7 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
QByteArray val = value.toString().toLatin1();
if (val != data->threadSpec) {
data->threadSpec = val;
- layoutChanged();
+ emit layoutChanged();
}
}
return true;
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index ca73b14a591..3a8c872436c 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -595,8 +595,10 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction)
// Update breakpoints
const QString functionName = info.functionName();
const QString fileName = info.fileName();
- const int lineNumber = byFunction? info.functionStartLineNumber() : info.lineNumber();
- SDEBUG("checkForBreakCondition" << byFunction << functionName << lineNumber << fileName);
+ const int lineNumber = byFunction
+ ? info.functionStartLineNumber() : info.lineNumber();
+ SDEBUG("checkForBreakCondition" << byFunction << functionName
+ << lineNumber << fileName);
if (m_stopOnNextLine) {
// Interrupt inferior
m_stopOnNextLine = false;
@@ -609,7 +611,11 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction)
if (!data)
return false;
- // we just run into a breakpoint
+ // Skip disabled breakpoint.
+ if (!data->enabled)
+ return false;
+
+ // We just run into a breakpoint.
//SDEBUG("RESOLVING BREAKPOINT AT " << fileName << lineNumber);
data->bpLineNumber = QByteArray::number(lineNumber);
data->bpFileName = fileName;
--
GitLab