Beginings of an experimental QML debugger view

2 files changed, 11 insertions, 0 deletions

diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 1315f19..ea2719d 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -60,10 +60,12 @@
 #include "qfxview.h"
 #include <QtDeclarative/qmlengine.h>
 #include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qmldebugger.h>
 
 
 QT_BEGIN_NAMESPACE
 DEFINE_BOOL_CONFIG_OPTION(itemTreeDump, ITEMTREE_DUMP);
+DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER);
 
 static QVariant stringToPixmap(const QString &str)
 {
@@ -324,6 +326,14 @@ void QFxView::continueExecute()
             if (itemTreeDump())
                 item->dump();
 
+            if(qmlDebugger()) {
+                QmlDebugger *debugger = new QmlDebugger;
+                debugger->setDebugObject(item);
+                debugger->show();
+                raise();
+                debugger->raise();
+            }
+
             QPerformanceLog::displayData();
             QPerformanceLog::clear();
             d->root = item;
diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp
index 87d8f4d..fc20fa9 100644
--- a/src/declarative/util/qmlopenmetaobject.cpp
+++ b/src/declarative/util/qmlopenmetaobject.cpp
@@ -48,6 +48,7 @@ QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, bool automatic)
 : autoCreate(automatic), parent(0), mem(0), _object(obj)
 {
     mob.setSuperClass(obj->metaObject());
+    mob.setClassName(obj->metaObject()->className());
     mob.setFlags(QMetaObjectBuilder::DynamicMetaObject);
 
     QObjectPrivate *op = QObjectPrivate::get(obj);