projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build against Qt 4.6 again
[quassel.git]
/
src
/
common
/
remotepeer.cpp
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
}
}