feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggeritem.cpp
	tests/unit/unittest/unittest.pro

Change-Id: Id2e4e9c2bc87b2556d7c2845aea3fe2fa11b630b
This commit is contained in:
Eike Ziller
2018-10-22 09:53:54 +02:00
parent 16de556c86 1cad74a7d4
commit 95db30bd3a
151 changed files with 2927 additions and 1910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/debugger/pdb/pdbengine.cpp
View File

@@ -167,14 +167,7 @@ void PdbEngine::interruptInferior()
interruptProcess(m_proc.processId(), GdbEngineType, &error);
}
void PdbEngine::executeStep()
{
notifyInferiorRunRequested();
notifyInferiorRunOk();
postDirectCommand("step");
}
void PdbEngine::executeStepI()
void PdbEngine::executeStepIn(bool)
{
notifyInferiorRunRequested();
notifyInferiorRunOk();
@@ -188,14 +181,7 @@ void PdbEngine::executeStepOut()
postDirectCommand("return");
}
void PdbEngine::executeNext()
{
notifyInferiorRunRequested();
notifyInferiorRunOk();
postDirectCommand("next");
}
void PdbEngine::executeNextI()
void PdbEngine::executeStepOver(bool)
{
notifyInferiorRunRequested();
notifyInferiorRunOk();
@@ -269,8 +255,24 @@ void PdbEngine::insertBreakpoint(const Breakpoint &bp)
void PdbEngine::updateBreakpoint(const Breakpoint &bp)
{
Q_UNUSED(bp);
QTC_CHECK(false);
QTC_ASSERT(bp, return);
const BreakpointState state = bp->state();
if (QTC_GUARD(state == BreakpointUpdateRequested))
notifyBreakpointChangeProceeding(bp);
if (bp->responseId().isEmpty()) // FIXME postpone update somehow (QTimer::singleShot?)
return;
// FIXME figure out what needs to be changed (there might be more than enabled state)
const BreakpointParameters &requested = bp->requestedParameters();
if (requested.enabled != bp->isEnabled()) {
if (bp->isEnabled())
postDirectCommand("disable " + bp->responseId());
else
postDirectCommand("enable " + bp->responseId());
bp->setEnabled(!bp->isEnabled());
}
// Pretend it succeeds without waiting for response.
notifyBreakpointChangeOk(bp);
}
void PdbEngine::removeBreakpoint(const Breakpoint &bp)
@@ -278,6 +280,10 @@ void PdbEngine::removeBreakpoint(const Breakpoint &bp)
QTC_ASSERT(bp, return);
QTC_CHECK(bp->state() == BreakpointRemoveRequested);
notifyBreakpointRemoveProceeding(bp);
if (bp->responseId().isEmpty()) {
notifyBreakpointRemoveFailed(bp);
return;
}
showMessage(QString("DELETING BP %1 IN %2")
.arg(bp->responseId()).arg(bp->fileName()));
postDirectCommand("clear " + bp->responseId());
@@ -504,8 +510,12 @@ void PdbEngine::handleOutput2(const QString &data)
bp->setLineNumber(lineNumber);
bp->adjustMarker();
bp->setPending(false);
QTC_CHECK(!bp->needsChange());
notifyBreakpointInsertOk(bp);
if (bp->needsChange()) {
bp->gotoState(BreakpointUpdateRequested, BreakpointInserted);
updateBreakpoint(bp);
// QTC_CHECK(!bp->needsChange());
}
}
}
}