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/enginemanager.cpp | |
| parent | 16de556c8699766e661de00cba0fc8de58109517 (diff) | |
| parent | 1cad74a7d426c0eeac53cd838cdc89c9788f84aa (diff) | |
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/enginemanager.cpp')
| -rw-r--r-- | src/plugins/debugger/enginemanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp index 8e0f1029144..4ea21bf99a0 100644 --- a/src/plugins/debugger/enginemanager.cpp +++ b/src/plugins/debugger/enginemanager.cpp @@ -344,8 +344,13 @@ void EngineManagerPrivate::selectUiForCurrentEngine() int row = 0; if (m_currentItem && m_currentItem->m_engine) { + ICore::updateAdditionalContexts(Context(Debugger::Constants::C_DEBUGGER_NOTRUNNING), + Context(Debugger::Constants::C_DEBUGGER_RUNNING)); perspective = m_currentItem->m_engine->perspective(); m_currentItem->m_engine->updateState(false); + } else { + ICore::updateAdditionalContexts(Context(Debugger::Constants::C_DEBUGGER_RUNNING), + Context(Debugger::Constants::C_DEBUGGER_NOTRUNNING)); } if (m_currentItem) |