diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-18 10:19:14 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-18 10:19:14 +0100 |
| commit | 99b2eb1ca9f0515681bf949db0ab6650f857e82b (patch) | |
| tree | 730a84b76b55e623ec331940631e247f55cc39df /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp | |
| parent | 7a107e7d004610ee8332b122aeb8993e61056b23 (diff) | |
| parent | e1aa32225865980992e79c53fdf3b40e0fcd0a86 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
doc/src/debugger/qtquick-debugger-example.qdoc
Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp index 2dc2367cf0..40de94aecc 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp @@ -82,8 +82,9 @@ void NodeInstanceSignalSpy::registerObject(QObject *spiedObject, const PropertyN // search recursive in objects if (metaProperty.isReadable() - && metaProperty.isWritable() - && QQmlMetaType::isQObject(metaProperty.userType())) { + && metaProperty.isWritable() + && QQmlMetaType::isQObject(metaProperty.userType()) + && QLatin1String(metaProperty.name()) != QLatin1String("parent")) { QObject *propertyObject = QQmlMetaType::toQObject(metaProperty.read(spiedObject)); if (propertyObject) registerObject(propertyObject, prefix + metaProperty.name() + '/'); |