summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2006-04-13 17:34:18 +0000
committerThiago Macieira <thiago@kde.org>2006-04-13 17:34:18 +0000
commit788a8967a1661d48886f214f8f16d5a12f6685a9 (patch)
treea99db7d6d964aa2e3add455b7341c4c46177a67f
parent4cc926f413c457a33cc86d248a51c040bfd38630 (diff)
* qt/qdbusinternalfilters.cpp: Don't show the parent's
contents (r528208)
-rw-r--r--ChangeLog5
-rw-r--r--qt/qdbusinternalfilters.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e22cb9fa..b0fb670a 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 7e938402..fe57a875 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);
}