From: Thiago Macieira <thiago@kde.org>
Date: Thu, 13 Apr 2006 17:34:18 +0000 (+0000)
Subject:         * qt/qdbusinternalfilters.cpp: Don't show the parent's
X-Git-Tag: dbus-0.62~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=788a8967a1661d48886f214f8f16d5a12f6685a9;p=thirdparty%2Fdbus.git

    * qt/qdbusinternalfilters.cpp: Don't show the parent's
          contents (r528208)
---

diff --git a/ChangeLog b/ChangeLog
index e22cb9faf..b0fb670a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-13  Thiago Macieira  <thiago.macieira@trolltech.com
+
+	* qt/qdbusinternalfilters.cpp: Don't show the parent's
+  	  contents (r528208)
+
 2006-04-10  Thiago Macieira  <thiago.macieira@trolltech.com
 
 	* qt/Makefile.am: fix the dependency for
diff --git a/qt/qdbusinternalfilters.cpp b/qt/qdbusinternalfilters.cpp
index 7e938402c..fe57a8750 100644
--- a/qt/qdbusinternalfilters.cpp
+++ b/qt/qdbusinternalfilters.cpp
@@ -237,7 +237,7 @@ void qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode *node,
         if (node->flags & QDBusConnection::ExportContents) {
             const QMetaObject *mo = node->obj->metaObject();
             for ( ; mo != &QObject::staticMetaObject; mo = mo->superClass())
-                xml_data += generateMetaObjectXml(QString(), mo, &QObject::staticMetaObject,
+                xml_data += generateMetaObjectXml(QString(), mo, mo->superClass(),
                                                   node->flags);
         }