projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
549c1ec
)
Build against Qt 4.6 again
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Tue, 9 Apr 2013 18:30:45 +0000
(20:30 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Tue, 9 Apr 2013 18:30:45 +0000
(20:30 +0200)
Bah.
src/common/remotepeer.cpp
patch
|
blob
|
history
diff --git
a/src/common/remotepeer.cpp
b/src/common/remotepeer.cpp
index
e405758
..
3ac55d1
100644
(file)
--- a/
src/common/remotepeer.cpp
+++ b/
src/common/remotepeer.cpp
@@
-168,7
+168,11
@@
void RemotePeer::handle(const HeartBeat &heartBeat)
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
+#if QT_VERSION >= 0x040900
emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
+#else
+ emit lagUpdated(heartBeatReply.timestamp().time().msecsTo(QDateTime::currentDateTime().toUTC().time()) / 2);
+#endif
}
}