From 5c64391fb4eb7c85634d08327e2cf82182260ac9 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 15 Oct 2015 16:29:03 +0200
Subject: 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>
---
 tests/auto/qml/qv4debugger/tst_qv4debugger.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests/auto')

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);
-- 
cgit v1.2.3