From 69c04d916cf3abb2fcc9c0e72610fe7f997b79f4 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 23 Jul 2010 15:26:58 +0200
Subject: [PATCH] QML JS Debugger: ensure we get the right Debugger UI
When a break point is hit, switch to the C++ debugger ui that
contains all the good widget for debugging.
This is a temporary fix, later the different engine should be
able to enable/disable part of the debugger ui as they whish
---
src/plugins/debugger/qml/qmlengine.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 9b8485aa485..1e41f08c0bc 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -33,6 +33,7 @@
#include "debuggerplugin.h"
#include "debuggerdialogs.h"
#include "debuggerstringutils.h"
+#include "debuggeruiswitcher.h"
#include "breakhandler.h"
#include "moduleshandler.h"
@@ -73,10 +74,6 @@
#endif
# define XSDEBUG(s) qDebug() << s
-#define CB(callback) &QmlEngine::callback, STRINGIFY(callback)
-
-//#define USE_CONGESTION_CONTROL
-
namespace Debugger {
namespace Internal {
@@ -655,6 +652,11 @@ void QmlEngine::messageReceived(const QByteArray &message)
else
watchHandler()->endCycle();
+ //ensure we got the right ui right now
+ Debugger::DebuggerUISwitcher *uiSwitcher = Debugger::DebuggerUISwitcher::instance();
+ uiSwitcher->setActiveLanguage("C++");
+
+
} else if (command == "RESULT") {
WatchData data;
QByteArray iname;
--
GitLab