Commit 69c04d91 authored by Olivier Goffart's avatar Olivier Goffart
Browse files

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
parent fca9ca46
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "debuggerplugin.h" #include "debuggerplugin.h"
#include "debuggerdialogs.h" #include "debuggerdialogs.h"
#include "debuggerstringutils.h" #include "debuggerstringutils.h"
#include "debuggeruiswitcher.h"
#include "breakhandler.h" #include "breakhandler.h"
#include "moduleshandler.h" #include "moduleshandler.h"
...@@ -73,10 +74,6 @@ ...@@ -73,10 +74,6 @@
#endif #endif
# define XSDEBUG(s) qDebug() << s # define XSDEBUG(s) qDebug() << s
#define CB(callback) &QmlEngine::callback, STRINGIFY(callback)
//#define USE_CONGESTION_CONTROL
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
...@@ -655,6 +652,11 @@ void QmlEngine::messageReceived(const QByteArray &message) ...@@ -655,6 +652,11 @@ void QmlEngine::messageReceived(const QByteArray &message)
else else
watchHandler()->endCycle(); watchHandler()->endCycle();
//ensure we got the right ui right now
Debugger::DebuggerUISwitcher *uiSwitcher = Debugger::DebuggerUISwitcher::instance();
uiSwitcher->setActiveLanguage("C++");
} else if (command == "RESULT") { } else if (command == "RESULT") {
WatchData data; WatchData data;
QByteArray iname; QByteArray iname;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment