diff options
| author | hjk <hjk121@nokiamail.com> | 2014-12-12 08:26:55 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-12-12 11:17:58 +0100 |
| commit | bf9b63174eefb0dd6788264867da06505942460d (patch) | |
| tree | 9751a29171d12e6986a6889d46c3e6da479901d5 /src/plugins/debugger/stackhandler.cpp | |
| parent | ef064154a4c29cd95af9007b9ab22493a7da1b37 (diff) | |
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 <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/stackhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/stackhandler.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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() |