src/dbus/qdbusinterface.cpp
branchGCC_SURGE
changeset 31 5daf16870df6
parent 30 5dc02b23752f
child 37 758a864f9613
--- a/src/dbus/qdbusinterface.cpp	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/dbus/qdbusinterface.cpp	Thu Jul 22 16:41:55 2010 +0100
@@ -49,6 +49,8 @@
 #include "qdbusinterface_p.h"
 #include "qdbusconnection_p.h"
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_NAMESPACE
 
 static void copyArgument(void *to, int id, const QVariant &arg)
@@ -258,7 +260,7 @@
 int QDBusInterface::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
 {
     _id = QDBusAbstractInterface::qt_metacall(_c, _id, _a);
-    if (_id < 0 || !d_func()->isValid)
+    if (_id < 0 || !d_func()->isValid || !d_func()->metaObject)
         return _id;
     return d_func()->metacall(_c, _id, _a);
 }
@@ -322,3 +324,5 @@
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS