Commit bcd2146d authored by hjk's avatar hjk
Browse files

debugger: don't stop at disabled breakpoints in script engine

parent c40521b1
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment