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

Debugger: Merge QmlInspectorAdapter into QmlInspectorAgent

Browse Source 
There's a 1:1 relation, and the abstraction is not needed anymore.

Also remove some unused code.

Change-Id: I09a2522deb5d522f46ec7518d19978a038032fbb
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
hjk
2015-08-26 11:51:56 +02:00
parent 5c815dea19
commit 156320ff6c
8 changed files with 406 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ namespace Internal {
class WatchData;
class WatchItem;
class QmlEnginePrivate;
class QmlAdapter;
class QmlInspectorAgent;
class QmlEngine : public DebuggerEngine, QmlJS::IScriptEvaluator
{
@@ -62,10 +62,11 @@ public:
QmlDebug::QmlDebugClient::State newState);
void logServiceActivity(const QString &service, const QString &logMessage);
void expressionEvaluated(quint32 queryId, const QVariant &result);
private slots:
void disconnected();
void documentUpdated(QmlJS::Document::Ptr doc);
void expressionEvaluated(quint32 queryId, const QVariant &result);
void errorMessageBoxFinished(int result);
void updateCurrentContext();
@@ -153,6 +154,7 @@ private:
private:
friend class QmlCppEngine;
friend class QmlEnginePrivate;
friend class QmlInspectorAgent;
QmlEnginePrivate *d;
};