X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=4ebb65b06a292a8604953029e6bd089f508f3282;hb=e25b94c06eb263f175361a8517599adb2b8588ed;hp=58a6348d34f3f85b3b0825149e229ff5be571740;hpb=04315f46a16fc3627218377071e008b6b9744992;p=quassel.git

diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp
index 58a6348d..4ebb65b0 100644
--- a/src/uisupport/actioncollection.cpp
+++ b/src/uisupport/actioncollection.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -202,12 +202,19 @@ void ActionCollection::actionDestroyed(QObject *obj)
     unlistAction(action);
 }
 
-
+#if QT_VERSION >= 0x050000
+void ActionCollection::connectNotify(const QMetaMethod &method)
+#else
 void ActionCollection::connectNotify(const char *signal)
+#endif
 {
     if (_connectHovered && _connectTriggered)
         return;
 
+#if QT_VERSION >= 0x050000
+    QByteArray signal = method.methodSignature();
+#endif
+
     if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) {
         if (!_connectHovered) {
             _connectHovered = true;
@@ -223,7 +230,11 @@ void ActionCollection::connectNotify(const char *signal)
         }
     }
 
+#if QT_VERSION >= 0x050000
+    QObject::connectNotify(method);
+#else
     QObject::connectNotify(signal);
+#endif
 }