diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-10-22 09:53:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-10-22 09:53:54 +0200 |
| commit | 95db30bd3a5808890c03864a1da84d443cc8bf38 (patch) | |
| tree | 92415e861f4818a28fdc2b4526bddfe1e3df46a6 /src/plugins/debugger/breakhandler.cpp | |
| parent | 16de556c8699766e661de00cba0fc8de58109517 (diff) | |
| parent | 1cad74a7d426c0eeac53cd838cdc89c9788f84aa (diff) | |
| download | qt-creator-95db30bd3a5808890c03864a1da84d443cc8bf38.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/debugger/debuggeritem.cpp
tests/unit/unittest/unittest.pro
Change-Id: Id2e4e9c2bc87b2556d7c2845aea3fe2fa11b630b
Diffstat (limited to 'src/plugins/debugger/breakhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/breakhandler.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 9a8ba32fa1..db5b6332ed 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -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)) { |