projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #73 from jpnurmi/signalproxy
[quassel.git]
/
src
/
uisupport
/
actioncollection.h
diff --git
a/src/uisupport/actioncollection.h
b/src/uisupport/actioncollection.h
index
5774eb3
..
22b0748
100644
(file)
--- a/
src/uisupport/actioncollection.h
+++ b/
src/uisupport/actioncollection.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-96,7
+96,11
@@
signals:
void actionTriggered(QAction *action);
protected slots:
void actionTriggered(QAction *action);
protected slots:
+#if QT_VERSION >= 0x050000
+ virtual void connectNotify(const QMetaMethod &method);
+#else
virtual void connectNotify(const char *signal);
virtual void connectNotify(const char *signal);
+#endif
virtual void slotActionTriggered();
private slots:
virtual void slotActionTriggered();
private slots: