projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Qt5 fixes
[quassel.git]
/
src
/
uisupport
/
actioncollection.cpp
diff --git
a/src/uisupport/actioncollection.cpp
b/src/uisupport/actioncollection.cpp
index
58a6348
..
4ebb65b
100644
(file)
--- a/
src/uisupport/actioncollection.cpp
+++ b/
src/uisupport/actioncollection.cpp
@@
-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 *
@@
-202,12
+202,19
@@
void ActionCollection::actionDestroyed(QObject *obj)
unlistAction(action);
}
unlistAction(action);
}
-
+#if QT_VERSION >= 0x050000
+void ActionCollection::connectNotify(const QMetaMethod &method)
+#else
void ActionCollection::connectNotify(const char *signal)
void ActionCollection::connectNotify(const char *signal)
+#endif
{
if (_connectHovered && _connectTriggered)
return;
{
if (_connectHovered && _connectTriggered)
return;
+#if QT_VERSION >= 0x050000
+ QByteArray signal = method.methodSignature();
+#endif
+
if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) {
if (!_connectHovered) {
_connectHovered = true;
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);
QObject::connectNotify(signal);
+#endif
}
}