projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0dfaab9
)
There won't ever be a Qt 4.9...
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 29 Jan 2014 20:54:25 +0000
(21:54 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 29 Jan 2014 20:54:25 +0000
(21:54 +0100)
... and this should actually have been a check for Qt 4.7+.
src/common/remotepeer.cpp
patch
|
blob
|
history
diff --git
a/src/common/remotepeer.cpp
b/src/common/remotepeer.cpp
index
f2439fc
..
e8b682d
100644
(file)
--- a/
src/common/remotepeer.cpp
+++ b/
src/common/remotepeer.cpp
@@
-189,7
+189,7
@@
void RemotePeer::handle(const HeartBeat &heartBeat)
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
-#if QT_VERSION >= 0x040
9
00
+#if QT_VERSION >= 0x040
7
00
emit lagUpdated(heartBeatReply.timestamp.msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
#else
emit lagUpdated(heartBeatReply.timestamp.time().msecsTo(QDateTime::currentDateTime().toUTC().time()) / 2);