From e9ffa63103dbf2a5734db27bd3f9c23ab204af12 Mon Sep 17 00:00:00 2001 From: APTX Date: Wed, 20 Feb 2013 18:48:54 +0100 Subject: [PATCH] QDate::secsTo() returns qint64 in Qt5, forcing all qBound() args to qint64 should work for both. --- client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index 5fd2110..5c04ae2 100644 --- a/client.cpp +++ b/client.cpp @@ -1082,7 +1082,7 @@ bool Client::possiblyValid(const QByteArray &reply) const void Client::resetReplyTimeoutTimer(AbstractReply *cmd) { Q_ASSERT(cmd); - int newTimeout = qBound(0, Client::UDP_API_COMMAND_TIMEOUT - cmd->timeSent().secsTo(QDateTime::currentDateTime()), Client::UDP_API_COMMAND_TIMEOUT); + int newTimeout = qBound(qint64(0), qint64(Client::UDP_API_COMMAND_TIMEOUT - cmd->timeSent().secsTo(QDateTime::currentDateTime())), qint64(Client::UDP_API_COMMAND_TIMEOUT)); newTimeout *= 1000; replyTimeoutTimer->start(newTimeout); } -- 2.52.0