diff --git a/src/VehicleSetup/Bootloader.cc b/src/VehicleSetup/Bootloader.cc
index a5382b3..86138b6 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 a840aa1..1105027 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;