feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove the dependence on QmlJSTools

Browse Source 
Change-Id: I26765134c19b9a6cf1e7ad26f313e2d4f8faf258
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
This commit is contained in:
Aurindam Jana
2012-10-08 13:17:10 +02:00
parent 3ebbba2e07
commit 1d04c4c3df
31 changed files with 451 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/qml/qmlengine.h
View File

@@ -39,6 +39,7 @@
#include <qmldebug/qdebugmessageclient.h>
#include <qmldebug/qmloutputparser.h>
#include <qmljs/qmljsdocument.h>
#include <qmljs/iscriptevaluator.h>
#include <utils/outputformat.h>
#include <QAbstractSocket>
@@ -53,7 +54,7 @@ namespace Internal {
class QmlAdapter;
class QmlEngine : public DebuggerEngine
class QmlEngine : public DebuggerEngine, QmlJS::IScriptEvaluator
{
Q_OBJECT
@@ -161,7 +162,7 @@ private:
void updateWatchData(const WatchData &data,
const WatchUpdateFlags &flags);
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages);
bool evaluateScriptExpression(const QString &expression);
bool evaluateScript(const QString &expression);
bool hasCapability(unsigned) const;
void quitDebugger();