5 files changed, 3 insertions, 10 deletions
diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
index ff46cc5961..fc8921ff35 100644
--- a/src/dbus/doc/qtdbus.qdocconf
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -19,7 +19,7 @@ sourcedirs += .. \
               ../../../examples/dbus/doc/src
 excludedirs += ../../../examples/widgets/doc
 
-examplesinstallpath     = dbus
+examplesinstallpath     = qtbase/dbus
 
 depends += qtdoc qtcore
 
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 49c7564566..91824c5c79 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -323,9 +323,6 @@ public:
     MetaObjectHash cachedMetaObjects;
     PendingCallList pendingCalls;
 
-    QMutex callDeliveryMutex;
-    QDBusCallDeliveryEvent *callDeliveryState; // protected by the callDeliveryMutex mutex
-
     bool anonymousAuthenticationAllowed;
 
 public:
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
index ad5632be5a..c93d6acf84 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
@@ -181,7 +181,6 @@ bool QDBusPendingCallPrivate::setReplyCallback(QObject *target, const char *memb
 
 void QDBusPendingCallPrivate::setMetaTypes(int count, const int *types)
 {
-    expectedReplyCount = count;
     if (count == 0) {
         expectedReplySignature = QLatin1String(""); // not null
         return;
diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h
index dcf733679c..571a0eb028 100644
--- a/src/dbus/qdbuspendingcall_p.h
+++ b/src/dbus/qdbuspendingcall_p.h
@@ -89,7 +89,6 @@ public:
     QDBusMessage replyMessage;
     DBusPendingCall *pending;
     QString expectedReplySignature;
-    int expectedReplyCount;
     // }
 
     QDBusPendingCallPrivate(const QDBusMessage &sent, QDBusConnectionPrivate *connection)
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 6c1b4c10ef..babb270da0 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -54,15 +54,13 @@ QT_BEGIN_NAMESPACE
     \a parent.
 */
 QDBusServer::QDBusServer(const QString &address, QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d(0)
 {
     if (address.isEmpty())
         return;
 
-    if (!qdbus_loadLibDBus()) {
-        d = 0;
+    if (!qdbus_loadLibDBus())
         return;
-    }
 
     emit QDBusConnectionManager::instance()->serverRequested(address, this);
     QObject::connect(d, SIGNAL(newServerConnection(QDBusConnectionPrivate*)),