summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusabstractadaptor_p.h
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-02-18 21:33:28 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-20 15:17:08 +0100
commitbdc775661733419aeef17e31c934c40d7f065d4e (patch)
treec0f22884fc19fde629188fbf53cf36f01b881d0d /src/dbus/qdbusabstractadaptor_p.h
parent441f89befac959b01e406d3bfae0d8db133a7cf9 (diff)
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusabstractadaptor_p.h')
-rw-r--r--src/dbus/qdbusabstractadaptor_p.h3
1 files changed, 3 insertions, 0 deletions
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);