X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=a76fc04a0329dda815dbcf26ac121da3ce855ce3;hp=a285d4db05b5e7c3d210b1878bb679e767fe1585;hb=e50ae7a06fc4e5d3a911c361d30953410deab609;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index a285d4db..a76fc04a 100644
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************
  * This is a subset of the API of KDE's KActionCollection.                 *
  ***************************************************************************/
@@ -23,7 +23,7 @@
 #ifndef ACTIONCOLLECTION_H_
 #define ACTIONCOLLECTION_H_
 
-#ifndef HAVE_KDE
+#ifndef HAVE_KDE4
 
 #include <QDebug>
 #include <QList>
@@ -96,7 +96,11 @@ signals:
     void actionTriggered(QAction *action);
 
 protected slots:
+#if QT_VERSION >= 0x050000
+    virtual void connectNotify(const QMetaMethod &signal);
+#else
     virtual void connectNotify(const char *signal);
+#endif
     virtual void slotActionTriggered();
 
 private slots:
@@ -119,7 +123,7 @@ private:
 int ActionCollection::count() const { return actions().count(); }
 bool ActionCollection::isEmpty() const { return actions().count(); }
 
-#else /* HAVE_KDE */
+#else /* HAVE_KDE4 */
 
 #include <KActionCollection>