forked from qt-creator/qt-creator
ScriptConsole: Refactor to QtMessageLogWindow
Move QML/JS independent classes to common Debugger code. A Debugger Engine needs to override evaluateScriptExpression() to provide engine specific script evaluation. Change-Id: I02b23b380a3eb1b12003b30ded0b7d075e44dfed Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
#include "debuggerstartparameters.h"
|
||||
#include "stackhandler.h"
|
||||
#include "qmlengine.h"
|
||||
#include "qtmessageloghandler.h"
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <utils/qtcassert.h>
|
||||
@@ -426,6 +427,11 @@ void QmlCppEngine::executeDebuggerCommand(const QString &command)
|
||||
}
|
||||
}
|
||||
|
||||
bool QmlCppEngine::evaluateScriptExpression(const QString &expression)
|
||||
{
|
||||
return d->m_qmlEngine->evaluateScriptExpression(expression);
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
|
||||
void QmlCppEngine::setupEngine()
|
||||
@@ -811,6 +817,11 @@ void QmlCppEngine::resetLocation()
|
||||
DebuggerEngine::resetLocation();
|
||||
}
|
||||
|
||||
Internal::QtMessageLogHandler *QmlCppEngine::qtMessageLogHandler() const
|
||||
{
|
||||
return d->m_qmlEngine->qtMessageLogHandler();
|
||||
}
|
||||
|
||||
DebuggerEngine *QmlCppEngine::cppEngine() const
|
||||
{
|
||||
return d->m_cppEngine;
|
||||
|
||||
Reference in New Issue
Block a user