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

21
src/plugins/debugger/breakhandler.cpp
View File

@@ -1709,7 +1709,6 @@ void BreakHandler::removeBreakpoint(const Breakpoint &bp)
break;
case BreakpointInserted:
case BreakpointInsertionProceeding:
bp->setState(BreakpointRemoveRequested);
requestBreakpointRemoval(bp);
break;
case BreakpointNew:
@@ -2565,17 +2564,17 @@ bool BreakpointManager::setData(const QModelIndex &idx, const QVariant &value, i
// setCurrentIndex(index(row, 0)); FIXME
return true;
}
// if (kev->key() == Qt::Key_Space) {
// const QModelIndexList selectedIds = ev.selectedRows();
// if (!selectedIds.isEmpty()) {
// const GlobalBreakpoints gbps = findBreakpointsByIndex(selectedIds);
// const bool isEnabled = gbps.isEmpty() || gbps.at(0)->isEnabled();
// for (GlobalBreakpoint gbp : gbps)
// gbp->m_parameters.enabled = isEnabled;
if (kev->key() == Qt::Key_Space) {
const QModelIndexList selectedIds = ev.selectedRows();
if (!selectedIds.isEmpty()) {
const GlobalBreakpoints gbps = findBreakpointsByIndex(selectedIds);
const bool isEnabled = gbps.isEmpty() || gbps.at(0)->isEnabled();
for (GlobalBreakpoint gbp : gbps)
gbp->setEnabled(!isEnabled);
// scheduleSynchronization();
// return true;
// }
// }
return true;
}
}
}
if (ev.as<QMouseEvent>(QEvent::MouseButtonDblClick)) {