From f64e7a18199cc83962d0139df09021000f8aa462 Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Wed, 18 Aug 2010 11:40:03 +0200 Subject: [PATCH] Qml Debugger: fix the debugger when the observer is reloaded. The problem was that we did not query the object with the good engine id --- src/plugins/qmljsinspector/qmljsinspector.cpp | 8 ++++---- src/plugins/qmljsinspector/qmljsinspector.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index 3fa5fc1dc45..76726bfb3de 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -206,14 +206,14 @@ void InspectorUi::disconnected() void InspectorUi::updateEngineList() { - const QList<QDeclarativeDebugEngineReference> engines = m_clientProxy->engines(); + m_engines = m_clientProxy->engines(); //#warning update the QML engines combo - if (engines.isEmpty()) + if (m_engines.isEmpty()) qWarning("qmldebugger: no engines found!"); else { - const QDeclarativeDebugEngineReference engine = engines.first(); + const QDeclarativeDebugEngineReference engine = m_engines.first(); m_clientProxy->queryEngineContext(engine.debugId()); } } @@ -254,7 +254,7 @@ void InspectorUi::serverReloaded() Document::Ptr doc = snapshot.document(it.key()); it.value()->resetInitialDoc(doc); } - m_clientProxy->queryEngineContext(0); + m_clientProxy->queryEngineContext(m_engines.value(0).debugId()); } diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h index b7b5020a2a4..6917dc2d17f 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.h +++ b/src/plugins/qmljsinspector/qmljsinspector.h @@ -148,6 +148,7 @@ private: ProjectExplorer::Project *m_debugProject; static InspectorUi *m_instance; + QList<QDeclarativeDebugEngineReference> m_engines; }; } // Internal -- GitLab