diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /src/dbus | |
parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/doc/qtdbus.qdocconf | 2 | ||||
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 3 | ||||
-rw-r--r-- | src/dbus/qdbuspendingcall.cpp | 1 | ||||
-rw-r--r-- | src/dbus/qdbuspendingcall_p.h | 1 | ||||
-rw-r--r-- | src/dbus/qdbusserver.cpp | 6 |
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*)), |