exp - can we run on QT 6

OpenHD · Feb 23, 2024 · 4e9fb6c · 4e9fb6c
1 parent 329e015
commit 4e9fb6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/app/telemetry/models/fcmavlinksystem.cpp b/app/telemetry/models/fcmavlinksystem.cpp
@@ -125,9 +125,8 @@ bool FCMavlinkSystem::process_message(const mavlink_message_t &msg)
         set_sys_time_unix_usec(sys_time.time_unix_usec);
         // TODO QT 6 doesn't have it
         QDateTime time;
-        time.setTime_t(sys_time.time_unix_usec/1000/1000);
+        time.setMSecsSinceEpoch(sys_time.time_unix_usec/1000);
         set_sys_time_unix_as_str(time.toString());
-
         uint32_t boot_time = sys_time.time_boot_ms;
         /*if (boot_time < m_last_boot || m_last_boot == 0) {
                 m_last_boot = boot_time;

diff --git a/app/telemetry/tutil/geodesi_helper.h b/app/telemetry/tutil/geodesi_helper.h
@@ -1,11 +1,11 @@
 #ifndef GEODESI_HELPER_H
 #define GEODESI_HELPER_H
 
-#include <geographiclib-c-2.0/src/geodesic.h>
+//#include <geographiclib-c-2.0/src/geodesic.h>
 //#include "lib/geographiclib-c-2.0/src/geodesic.h"
 
 // return: distance in m between 2 points
-static double distance_between(double lat1,double lon1,double lat2,double lon2){
+/*static double distance_between(double lat1,double lon1,double lat2,double lon2){
     double s12;
     //double azi1;
     //double azi2;
@@ -16,10 +16,10 @@ static double distance_between(double lat1,double lon1,double lat2,double lon2){
     geod_init(&geod,a,f);
     geod_inverse(&geod,lat1,lon1,lat2,lon2,&s12,0,0); //&azi1,&azi2
     return s12;
-}
+}*/
 
-/*static double distance_between(double lat1,double lon1,double lat2,double lon2){
+static double distance_between(double lat1,double lon1,double lat2,double lon2){
     return 0;
-}*/
+}
 
 #endif // GEODESI_HELPER_H
diff --git a/app/util/qopenhd.cpp b/app/util/qopenhd.cpp
@@ -79,8 +79,7 @@ void QOpenHD::switchToLanguage(const QString &language) {
         qDebug()<<"Error switch language- engine not set";
         return;
     }
-    // TODO QT 6 doesn't have it
-    QLocale::setDefault(language);
+    QLocale::setDefault(QLocale(language));
 
     if (!m_translator.isEmpty()) {
         QCoreApplication::removeTranslator(&m_translator);