diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-10-15 16:29:03 +0200 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2015-10-15 17:11:50 +0000 |
commit | 5c64391fb4eb7c85634d08327e2cf82182260ac9 (patch) | |
tree | 4122ae3edfc70897955fbddfe8910999023113f2 /tests/auto/qml | |
parent | 6fc1e0fc36f0732e79375a0e105816eb17893962 (diff) |
Only set V4 debugger when service is enabled
Otherwise different debug services could steal each other's debugers.
Change-Id: Ic0a50333d21c7d20a7124240ea598f8446400ae3
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml')
-rw-r--r-- | tests/auto/qml/qv4debugger/tst_qv4debugger.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp index 902ad50be7..39a1fbc173 100644 --- a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp +++ b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp @@ -41,6 +41,7 @@ #include <private/qv4debugging_p.h> #include <private/qv8engine_p.h> #include <private/qv4objectiterator_p.h> +#include <private/qv4isel_moth_p.h> using namespace QV4; using namespace QV4::Debugging; @@ -317,6 +318,7 @@ void tst_qv4debugger::init() m_javaScriptThread = new QThread; m_engine = new TestEngine; m_v4 = m_engine->v4Engine(); + m_v4->iselFactory.reset(new QV4::Moth::ISelFactory); m_v4->setDebugger(new V4Debugger(m_v4)); m_engine->moveToThread(m_javaScriptThread); m_javaScriptThread->start(); @@ -464,6 +466,7 @@ void tst_qv4debugger::conditionalBreakPointInQml() QQmlEngine engine; QV4::ExecutionEngine *v4 = QV8Engine::getV4(&engine); V4Debugger *v4Debugger = new V4Debugger(v4); + v4->iselFactory.reset(new QV4::Moth::ISelFactory); v4->setDebugger(v4Debugger); QScopedPointer<QThread> debugThread(new QThread); |