X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=c918c82119ab816e04a84e17b10629472d3e46ac;hb=019ba67419a5d92eb50275311c05002eef0eb11a;hp=7dc03909f3916f0ff6b1efe92fe71aeccc82c410;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp index 7dc03909..c918c821 100644 --- a/src/uisupport/actioncollection.cpp +++ b/src/uisupport/actioncollection.cpp @@ -202,20 +202,31 @@ void ActionCollection::actionDestroyed(QObject *obj) unlistAction(action); } - +#if QT_VERSION >= 0x050000 +void ActionCollection::connectNotify(const QMetaMethod &signal) +#else void ActionCollection::connectNotify(const char *signal) +#endif { if (_connectHovered && _connectTriggered) return; +#if QT_VERSION >= 0x050000 + if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) { +#else if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) { +#endif if (!_connectHovered) { _connectHovered = true; foreach(QAction* action, actions()) connect(action, SIGNAL(hovered()), SLOT(slotActionHovered())); } } +#if QT_VERSION >= 0x050000 + else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) { +#else else if (QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction *))) == signal) { +#endif if (!_connectTriggered) { _connectTriggered = true; foreach(QAction* action, actions())