--- a/src/dbus/qdbusxmlgenerator.cpp	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/dbus/qdbusxmlgenerator.cpp	Thu Jul 22 16:41:55 2010 +0100
@@ -49,6 +49,8 @@
 #include "qdbusmetatype.h"
 #include "qdbusutil_p.h"
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_NAMESPACE
 
 extern QDBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo,
@@ -158,7 +160,7 @@
                 // do we need to describe this argument?
                 if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid)
                     xml += QString::fromLatin1("      <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n")
-                           .arg(typeNameToXml(mm.typeName()));
+                        .arg(typeNameToXml(QVariant::typeToName(QVariant::Type(typeId))));
             } else
                 continue;
         }
@@ -302,3 +304,5 @@
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS