From bf9b63174eefb0dd6788264867da06505942460d Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 12 Dec 2014 08:26:55 +0100 Subject: Debugger: Introduce a "Native Mixed" switch This paves the the way to mixed QML/C++ debugging through the native backends. Currently this requires QTC_DEBUGGER_NATIVE_MIXED to be set in the environment. Change-Id: I126ad945e84806f3b548408318007351628c912f Reviewed-by: Leena Miettinen Reviewed-by: Christian Stenger --- src/plugins/debugger/stackhandler.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/plugins/debugger/stackhandler.cpp') diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index 4c1ccd4433..6ba5ecd542 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -64,8 +64,12 @@ StackHandler::StackHandler() m_contentsValid = false; m_currentIndex = -1; m_canExpand = false; - connect(action(OperateByInstruction), SIGNAL(triggered()), - this, SLOT(resetModel())); + connect(action(OperateByInstruction), &QAction::triggered, + this, &StackHandler::resetModel); + + if (isNativeMixedEnabled()) + connect(action(OperateNativeMixed), &QAction::triggered, + this, &StackHandler::resetModel); } StackHandler::~StackHandler() -- cgit v1.2.1