From bdc775661733419aeef17e31c934c40d7f065d4e Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Sat, 18 Feb 2012 21:33:28 +0100 Subject: Port QDBusAdaptorConnector meta-object to revision 6 We want to drop support for old revisions in Qt 5. This commit brings the QDBusAdaptorConnector meta-object in sync with current moc output. The QtDBus implementation was assuming that the relaySlot() slot would be created at index methodOffset() in the meta-object, but since revision 4 that's no longer the case (signals always come first). Made the code more robust by actually querying the meta-object what the index is. Change-Id: Ie0791680cc2e9e5fb1472c4462c391f92ea22ea6 Reviewed-by: Thiago Macieira --- src/dbus/qdbusabstractadaptor_p.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/dbus/qdbusabstractadaptor_p.h') diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index a0b61e1887..9b10f03eda 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -127,6 +127,9 @@ protected: public: // member variables AdaptorMap adaptors; bool waitingForPolish : 1; + +private: + static int relaySlotMethodIndex(); }; extern QDBusAdaptorConnector *qDBusFindAdaptorConnector(QObject *object); -- cgit v1.2.3