From 9fa3695eb3b03a4d37bc3c75bdb3bf5c5205e48c Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 14 Sep 2009 14:09:39 +1000
Subject: Don't crash. The engine tree shouldn't have all these objects in it,
 but for now, just prevent crash when there are signals with parameters.

---
 src/declarative/qml/qmlenginedebug.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 321fe74..7f9e530 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qmlenginedebug_p.h"
+#include "qmlboundsignal_p.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
 #include <QtDeclarative/qmlengine.h>
@@ -103,7 +104,11 @@ QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
 
     if (prop.type() < QVariant::UserType) {
         rv.type = QmlObjectProperty::Basic;
-        rv.value = prop.read(obj);
+        if (qobject_cast<QmlBoundSignalParameters*>(obj) && prop.name() != QByteArray("objectName"))
+            // these "properties" only have meaning during signal emission
+            rv.value = tr("(signal parameter)");
+        else
+            rv.value = prop.read(obj);
     } else if (QmlMetaType::isObject(prop.userType()))  {
         rv.type = QmlObjectProperty::Object;
     } else if (QmlMetaType::isList(prop.userType()) ||
-- 
cgit v0.12