diff options
| author | Orgad Shaneh <[email protected]> | 2017-10-17 20:00:44 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2017-10-17 20:00:44 +0300 |
| commit | 371b2bbbab6b4bdc300ef7c3d4ce9c504ac25472 (patch) | |
| tree | 0987f23b83e9031e35fa84d9495ee4b538f87e81 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 5c554c0de9fd9115dbcfa010353640b11e349c6c (diff) | |
| parent | aa4e05f07b22b062316bf8a35517956c3770e0f6 (diff) | |
Merge remote-tracking branch 'origin/4.5' into master
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 23ef2ba06cf..d8ee01a58f6 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3035,7 +3035,7 @@ DebuggerEngine *currentEngine() { DebuggerEngine *engine = nullptr; if (dd->m_currentRunTool) - engine = dd->m_currentRunTool->activeEngine(); + engine = dd->m_currentRunTool->engine(); return engine ? engine : dd->dummyEngine(); } |