diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-04-18 14:20:54 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2012-05-09 12:42:44 +0200 |
commit | 7f09d0b756ff3f9bb52737d4aaf65ed84d751316 (patch) | |
tree | 7469486e35fd0b6a3e7c4e7e8775f75784c414fd /src/libs/qmldebug/baseenginedebugclient.h | |
parent | d201c681daae42b005c9ea4f3a1e272ea9cc5ef5 (diff) | |
download | qt-creator-7f09d0b756ff3f9bb52737d4aaf65ed84d751316.tar.gz |
Merge QML inspector into debugger plugin
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.
Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'src/libs/qmldebug/baseenginedebugclient.h')
-rw-r--r-- | src/libs/qmldebug/baseenginedebugclient.h | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/src/libs/qmldebug/baseenginedebugclient.h b/src/libs/qmldebug/baseenginedebugclient.h index 1c648892d7..0e19e0de71 100644 --- a/src/libs/qmldebug/baseenginedebugclient.h +++ b/src/libs/qmldebug/baseenginedebugclient.h @@ -66,7 +66,7 @@ public: quint32 queryObject(const QmlDebugObjectReference &object); quint32 queryObjectRecursive(const QmlDebugObjectReference &object); quint32 queryExpressionResult(int objectDebugId, - const QString &expr); + const QString &expr, int engineId = -1); virtual quint32 setBindingForObject(int objectDebugId, const QString &propertyName, const QVariant &bindingExpression, bool isLiteralValue, @@ -116,7 +116,7 @@ class QmlDebugEngineReference { public: QmlDebugEngineReference() : m_debugId(-1) {} - QmlDebugEngineReference(int id) : m_debugId(id) {} + explicit QmlDebugEngineReference(int id) : m_debugId(id) {} int debugId() const { return m_debugId; } QString name() const { return m_name; } @@ -133,7 +133,7 @@ class QmlDebugObjectReference { public: QmlDebugObjectReference() : m_debugId(-1), m_parentId(-1), m_contextDebugId(-1), m_needsMoreData(false) {} - QmlDebugObjectReference(int id) : m_debugId(id), m_parentId(-1), m_contextDebugId(-1), m_needsMoreData(false) {} + explicit QmlDebugObjectReference(int id) : m_debugId(id), m_parentId(-1), m_contextDebugId(-1), m_needsMoreData(false) {} int debugId() const { return m_debugId; } int parentId() const { return m_parentId; } @@ -148,18 +148,18 @@ public: QList<QmlDebugPropertyReference> properties() const { return m_properties; } QList<QmlDebugObjectReference> children() const { return m_children; } - bool insertObjectInTree(const QmlDebugObjectReference &obj) + int insertObjectInTree(const QmlDebugObjectReference &obj) { for (int i = 0; i < m_children.count(); i++) { if (m_children[i].debugId() == obj.debugId()) { m_children.replace(i, obj); - return true; + return debugId(); } else { if (m_children[i].insertObjectInTree(obj)) - return true; + return debugId(); } } - return false; + return -1; } bool operator ==(const QmlDebugObjectReference &obj) @@ -229,4 +229,20 @@ Q_DECLARE_METATYPE(QmlDebug::QmlDebugEngineReference) Q_DECLARE_METATYPE(QmlDebug::QmlDebugEngineReferenceList) Q_DECLARE_METATYPE(QmlDebug::QmlDebugContextReference) +inline QDebug operator<<(QDebug dbg, const QmlDebug::QmlDebugEngineReference &ref) { + dbg.nospace() << "(Engine " << ref.debugId() << "/" << ref.name() << ")"; + return dbg.space(); +} + +inline QDebug operator<<(QDebug dbg, const QmlDebug::QmlDebugContextReference &ref) { + dbg.nospace() << "(Context " << ref.debugId() << "/" << ref.name() << ")"; + return dbg.space(); +} + +inline QDebug operator<<(QDebug dbg, const QmlDebug::QmlDebugObjectReference &ref) { + dbg.nospace() << "(Object " << ref.debugId() << "/" + << (ref.idString().isEmpty() ? ref.idString() : ref.className()) << ")"; + return dbg.space(); +} + #endif // BASEENGINEDEBUGCLIENT_H |