diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.cc b/src/AutoPilotPlugins/Common/RadioComponentController.cc
index b6b7bd24e084bf1de64b1b7af5b5de62a530a706..59864def032c5ee1475a8f2fcf46c36cf1612b8f 100644
--- a/src/AutoPilotPlugins/Common/RadioComponentController.cc
+++ b/src/AutoPilotPlugins/Common/RadioComponentController.cc
@@ -15,6 +15,7 @@
 #include "RadioComponentController.h"
 #include "QGCApplication.h"
 
+#include <QElapsedTimer>
 #include <QSettings>
 
 QGC_LOGGING_CATEGORY(RadioComponentControllerLog, "RadioComponentControllerLog")
diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.h b/src/AutoPilotPlugins/Common/RadioComponentController.h
index 86ee03ba8b44b77cdd350f5cde8285020ebc52b6..db6cdce23529665e1922d6fdfb0d9010b0aab534 100644
--- a/src/AutoPilotPlugins/Common/RadioComponentController.h
+++ b/src/AutoPilotPlugins/Common/RadioComponentController.h
@@ -310,7 +310,7 @@ private:
     int     _stickDetectInitialValue;
     int     _stickDetectValue;
     bool    _stickDetectSettleStarted;
-    QTime   _stickDetectSettleElapsed;
+    QElapsedTimer   _stickDetectSettleElapsed;
     static const int _stickDetectSettleMSecs;
 
     bool        _unitTestMode   = false;
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 5b055eb904884f38d4d69c8593517e05b8619dc0..879c4baa2339630e30b596a91c2ba1ea0bf6f199 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include <QElapsedTimer>
 #include <QObject>
 #include <QVariantList>
 #include <QGeoCoordinate>
@@ -1519,7 +1520,7 @@ private:
     QString _gitHash;
     quint64 _uid;
 
-    QTime   _lastBatteryAnnouncement;
+    QElapsedTimer   _lastBatteryAnnouncement;
     int     _lastAnnouncedLowBatteryPercent;
 
     SharedLinkInterfacePointer _priorityLink;  // We always keep a reference to the priority link to manage shutdown ordering
diff --git a/src/VehicleSetup/Bootloader.cc b/src/VehicleSetup/Bootloader.cc
index a5382b31301cff8fb8630d734d722f93527aed1e..86138b60c0a78405107ae277920651d05277bcd7 100644
--- a/src/VehicleSetup/Bootloader.cc
+++ b/src/VehicleSetup/Bootloader.cc
@@ -18,7 +18,7 @@
 #include <QFile>
 #include <QSerialPortInfo>
 #include <QDebug>
-#include <QTime>
+#include <QElapsedTimer>
 
 #include "QGC.h"
 
@@ -54,9 +54,9 @@ bool Bootloader::_write(QSerialPort* port, const uint8_t byte)
 bool Bootloader::_read(QSerialPort* port, uint8_t* data, qint64 maxSize, int readTimeout)
 {
     qint64 bytesAlreadyRead = 0;
-    
+
     while (bytesAlreadyRead < maxSize) {
-        QTime timeout;
+        QElapsedTimer timeout;
         timeout.start();
         while (port->bytesAvailable() < 1) {
             if (timeout.elapsed() > readTimeout) {
diff --git a/src/VehicleSetup/JoystickConfigController.h b/src/VehicleSetup/JoystickConfigController.h
index a840aa13bb08362be1f84c8d51a3d4ab0187bf8f..1105027929aaf22f3a398ca85c7157cbf6eb4fee 100644
--- a/src/VehicleSetup/JoystickConfigController.h
+++ b/src/VehicleSetup/JoystickConfigController.h
@@ -14,7 +14,7 @@
 #ifndef JoystickConfigController_H
 #define JoystickConfigController_H
 
-#include <QTimer>
+#include <QElapsedTimer>
 
 #include "FactPanelController.h"
 #include "QGCLoggingCategory.h"
@@ -273,7 +273,7 @@ private:
     int     _stickDetectInitialValue;
     int     _stickDetectValue;
     bool    _stickDetectSettleStarted;
-    QTime   _stickDetectSettleElapsed;
+    QElapsedTimer   _stickDetectSettleElapsed;
 
     static const int _stickDetectSettleMSecs;