diff options
Diffstat (limited to 'src/declarative/debugger/qmldebugger.cpp')
-rw-r--r-- | src/declarative/debugger/qmldebugger.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/declarative/debugger/qmldebugger.cpp b/src/declarative/debugger/qmldebugger.cpp index 76d6b10..49ad8d9 100644 --- a/src/declarative/debugger/qmldebugger.cpp +++ b/src/declarative/debugger/qmldebugger.cpp @@ -61,10 +61,11 @@ #include <QtDeclarative/qmlexpression.h> #include <private/qmlpropertyview_p.h> #include <private/qmlwatches_p.h> +#include <private/qmlcanvasdebugger_p.h> QmlDebugger::QmlDebugger(QWidget *parent) : QWidget(parent), m_tree(0), m_warnings(0), m_watchTable(0), m_watches(0), - m_properties(0), m_text(0), m_highlightedItem(0) + m_canvas(0), m_properties(0), m_text(0), m_highlightedItem(0) { QHBoxLayout *layout = new QHBoxLayout; setLayout(layout); @@ -110,6 +111,11 @@ QmlDebugger::QmlDebugger(QWidget *parent) tabs->addTab(m_properties, "Properties"); tabs->setCurrentWidget(m_properties); + m_canvas = new QmlCanvasDebugger(m_watches, this); + QObject::connect(m_canvas, SIGNAL(objectClicked(quint32)), + this, SLOT(highlightObject(quint32))); + tabs->addTab(m_canvas, "Canvas"); + splitter->addWidget(tabs); splitter->setStretchFactor(1, 2); @@ -331,6 +337,11 @@ bool operator<(const QPair<quint32, QPair<int, QString> > &lhs, return lhs.first < rhs.first; } +void QmlDebugger::setCanvas(QSimpleCanvas *c) +{ + m_canvas->setCanvas(c); +} + void QmlDebugger::setDebugObject(QObject *obj) { m_tree->clear(); |