Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

2 files changed, 4 insertions, 4 deletions

diff --git a/examples/network/torrent/ratecontroller.cpp b/examples/network/torrent/ratecontroller.cpp
index 87c65096b6..96474806f5 100644
--- a/examples/network/torrent/ratecontroller.cpp
+++ b/examples/network/torrent/ratecontroller.cpp
@@ -96,8 +96,8 @@ void RateController::transfer()
     if (sockets.isEmpty())
         return;
 
-    int msecs = 1000;
-    if (!stopWatch.isNull())
+    qint64 msecs = 1000;
+    if (stopWatch.isValid())
         msecs = qMin(msecs, stopWatch.elapsed());
 
     qint64 bytesToWrite = (upLimit * msecs) / 1000;
diff --git a/examples/network/torrent/ratecontroller.h b/examples/network/torrent/ratecontroller.h
index a4aa596ce1..f8bff0cc36 100644
--- a/examples/network/torrent/ratecontroller.h
+++ b/examples/network/torrent/ratecontroller.h
@@ -53,7 +53,7 @@
 
 #include <QObject>
 #include <QSet>
-#include <QTime>
+#include <QElapsedTimer>
 
 class PeerWireClient;
 
@@ -79,7 +79,7 @@ public slots:
     void scheduleTransfer();
 
 private:
-    QTime stopWatch;
+    QElapsedTimer stopWatch;
     QSet<PeerWireClient *> sockets;
     int upLimit;
     int downLimit;