remove a few imports and deprecated things ... now we can at least co…

…mpile and run on QT 6
OpenHD · Feb 26, 2024 · 32e190c · 32e190c
1 parent 92b7fd5
commit 32e190c
Show file tree

Hide file tree

Showing 140 changed files with 200 additions and 360 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(QOpenHDProject VERSION 0.1 LANGUAGES CXX)
+project(QOpenHDProject VERSION 0.1 LANGUAGES C CXX)
 
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -73,6 +75,7 @@ qt_add_executable(QOpenHDApp
     app/videostreaming/vscommon/decodingstatistcs.h
     ##
     lib/geographiclib-c-2.0/src/geodesic.c
+    lib/geographiclib-c-2.0/src/geodesic.h
     ##
     ##
     ##
@@ -90,13 +93,22 @@ target_include_directories(QOpenHDApp PUBLIC app/telemetry/util)
 
 target_include_directories(QOpenHDApp PUBLIC app/videostreaming/vscommon)
 target_include_directories(QOpenHDApp PUBLIC lib)
+target_include_directories(QOpenHDApp PUBLIC lib/geographiclib-c-2.0/src)
 
-qt_add_qml_module(QOpenHDApp
-    URI QOpenHD
-    VERSION 1.0
-    QML_FILES
-        qml/MainX.qml
-)
+#qt_add_qml_module(QOpenHDApp
+#    URI hello
+#    VERSION 1.0
+#    QML_FILES
+#        qml/main.qml
+#        qml/ui/AnyParamBusyIndicator.qml
+#        qml/ui/HUDOverlayGrid.qml
+#        qml/ui/elements/
+#        qml/ui/sidebar/
+#        qml/ui/widgets/
+#)
+#qt6_add_resources(qml_QRC
+#    PREFIX "/"
+#    qml/qml.qrc)
 
 
 target_link_libraries(QOpenHDApp

diff --git a/app/main.cpp b/app/main.cpp
@@ -419,7 +419,13 @@ int main(int argc, char *argv[]) {
      );
 
     // TODO QT 6
-    engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    //engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    //const QUrl url("qrc:/qt/qml/hello/qml/main.qml");
+    QCoreApplication::addLibraryPath("./");
+    //const QUrl url(QStringLiteral("qrc:/qt/qml/main.qml"));
+    //const QUrl url(QStringLiteral("qrc:/qml/main.qml"));
+    const QUrl url(QStringLiteral("qrc:/main.qml"));
+    engine.load(url);
     //engine.loadFromModule("QOpenHD", "qrc:/main.qml");
     //engine.loadFromModule("QOpenHDApp","qrc:/main.qml");
     //engine.load("qml/main.qml");

diff --git a/app/telemetry/tutil/geodesi_helper.h b/app/telemetry/tutil/geodesi_helper.h
@@ -2,10 +2,13 @@
 #define GEODESI_HELPER_H
 
 //#include <geographiclib-c-2.0/src/geodesic.h>
-#include "lib/geographiclib-c-2.0/src/geodesic.h"
+extern "C" {
+//#include "lib/geographiclib-c-2.0/src/geodesic.h"
+//#include "geodesi.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 +19,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/qml/MainX.qml b/qml/MainX.qml
diff --git a/qml/main.qml b/qml/main.qml
@@ -98,14 +98,14 @@ ApplicationWindow {
             }
         }
 
-
-        ColorPicker {
+        // TODO QT 6
+        /*ColorPicker {
             id: colorPicker
             height: 264
             width: 380
             z: 15.0
             anchors.centerIn: parent
-        }
+        }*/
 
         // UI areas
 

diff --git a/qml/ui/AnyParamBusyIndicator.qml b/qml/ui/AnyParamBusyIndicator.qml
@@ -1,10 +1,10 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0

diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml
@@ -1,8 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
 
 import OpenHD 1.0
 
@@ -494,12 +492,13 @@ Item {
     }
 
     // Extra element - allows customizing the OSD color(s) and more
-    OSDCustomizer {
+    // TODO QT 6
+    /*OSDCustomizer {
         id: osdCustomizer
         anchors.centerIn: parent
         visible: false
         z: 5.0
-    }
+    }*/
     TapHandler {
         acceptedButtons: Qt.AllButtons
         onTapped: {

diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.12
 import QtQuick.Window 2.12
 import Qt.labs.settings 1.0

diff --git a/qml/ui/configpopup/ConfigPopupSidebarButton.qml b/qml/ui/configpopup/ConfigPopupSidebarButton.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.12
 import QtQuick.Window 2.12
 import Qt.labs.settings 1.0

diff --git a/qml/ui/configpopup/connect/ConnectPanel.qml b/qml/ui/configpopup/connect/ConnectPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0

diff --git a/qml/ui/configpopup/connect/PaneConnectionMode.qml b/qml/ui/configpopup/connect/PaneConnectionMode.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
@@ -235,9 +235,10 @@ Rectangle{
                 TextField {
                     Layout.alignment: Qt.AlignCenter
                     id: textFieldip
-                    validator: RegExpValidator {
-                        regExp:  /^((?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\.){0,3}(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$/
-                    }
+                    // TODO QT 6
+                    //validator: RegExpValidator {
+                    //    regExp:  /^((?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\.){0,3}(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$/
+                    //}
                     inputMethodHints: Qt.ImhFormattedNumbersOnly
                     text: settings.qopenhd_mavlink_connection_manual_tcp_ip
                 }

diff --git a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 

diff --git a/qml/ui/configpopup/dev/QOpenHDServiceDialoque.qml b/qml/ui/configpopup/dev/QOpenHDServiceDialoque.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0

diff --git a/qml/ui/configpopup/log/LogMessagesStatusView.qml b/qml/ui/configpopup/log/LogMessagesStatusView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0