diff options
| author | hjk <hjk@qt.io> | 2018-10-05 12:03:19 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-10-05 12:54:44 +0000 |
| commit | 36b654567d639c313d7c1c39e360bcd8915f0ed5 (patch) | |
| tree | 51c5f3eb5f03380d07ae4969ffee0ec82c496cd9 /src/plugins/debugger/stackhandler.cpp | |
| parent | e0d7d037207c2716380b7a2a860e13138f6eaed5 (diff) | |
Debugger: Finalize moving Operate by Instruction to engines
Fixes: QTCREATORBUG-21211
Fixes: QTCREATORBUG-21212
Change-Id: I6c0259052336f2141462157c319abeaec9a1e483
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/debugger/stackhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/stackhandler.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index c4bb6630b0..e96f457ae6 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -69,8 +69,6 @@ StackHandler::StackHandler(DebuggerEngine *engine) { setObjectName("StackModel"); - connect(action(OperateByInstruction), &QAction::triggered, - this, &StackHandler::resetModel); connect(action(ExpandStack), &QAction::triggered, this, &StackHandler::reloadFullStack); connect(action(MaximalStackDepth), &QAction::triggered, @@ -159,7 +157,7 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const if (index.row() == m_stackFrames.size()) return QAbstractTableModel::flags(index); const StackFrame &frame = m_stackFrames.at(index.row()); - const bool isValid = frame.isUsable() || boolSetting(OperateByInstruction); + const bool isValid = frame.isUsable() || m_engine->operatesByInstruction(); return isValid && m_contentsValid ? QAbstractTableModel::flags(index) : Qt::ItemFlags(); } @@ -258,7 +256,7 @@ void StackHandler::setFramesAndCurrentIndex(const GdbMi &frames, bool isFull) // a few exceptions: // Always jump to frame #0 when stepping by instruction. - if (boolSetting(OperateByInstruction)) + if (m_engine->operatesByInstruction()) targetFrame = 0; // If there is no frame with source, jump to frame #0. @@ -284,7 +282,7 @@ void StackHandler::prependFrames(const StackFrames &frames) int StackHandler::firstUsableIndex() const { - if (!boolSetting(OperateByInstruction)) { + if (!m_engine->operatesByInstruction()) { for (int i = 0, n = m_stackFrames.size(); i != n; ++i) if (m_stackFrames.at(i).isUsable()) return i; |