diff options
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 5 | ||||
-rw-r--r-- | src/dbus/qdbusintegrator.cpp | 3 | ||||
-rw-r--r-- | src/dbus/qdbusserver.cpp | 3 | ||||
-rw-r--r-- | src/dbus/qdbusserver.h | 1 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 39e8c9a574..3b1853bde0 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -214,6 +214,8 @@ public: void enableDispatchDelayed(QObject *context); + void _q_newConnection(QDBusConnectionPrivate *newConnection); + private: void checkThread(); bool handleError(const QDBusErrorInternal &error); @@ -241,8 +243,6 @@ private: void watchForDBusDisconnection(); - void _q_newConnection(QDBusConnectionPrivate *newConnection); - void handleAuthentication(); bool addSignalHook(const QString &key, const SignalHook &hook); @@ -275,7 +275,6 @@ signals: void messageNeedsSending(QDBusPendingCallPrivate *pcall, void *msg, int timeout = -1); void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner); void callWithCallbackFailed(const QDBusError &error, const QDBusMessage &message); - void newServerConnection(QDBusConnectionPrivate *newConnection); public: QAtomicInt ref; diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 497a6d3546..c8e7159b15 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -316,7 +316,8 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v newConnection->setDispatchEnabled(false); // this is a queued connection and will resume in the QDBusServer's thread - emit serverConnection->newServerConnection(newConnection); + QMetaObject::invokeMethod(serverConnection, &QDBusConnectionPrivate::_q_newConnection, + Qt::QueuedConnection, newConnection); // we've disabled dispatching of events, so now we post an event to the // QDBusServer's thread in order to enable it after the diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 3d9dff891d..e9131a14c4 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -40,9 +40,6 @@ QDBusServer::QDBusServer(const QString &address, QObject *parent) instance->createServer(address, this); Q_ASSERT(d != nullptr); - - QObject::connect(d, SIGNAL(newServerConnection(QDBusConnectionPrivate*)), - this, SLOT(_q_newConnection(QDBusConnectionPrivate*)), Qt::QueuedConnection); } /*! diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index b482314319..34985cc055 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -37,7 +37,6 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QDBusServer) - Q_PRIVATE_SLOT(d, void _q_newConnection(QDBusConnectionPrivate*)) QDBusConnectionPrivate *d; friend class QDBusConnectionPrivate; }; |