wip

Signed-off-by: Patrick José Pereira <[email protected]>
bluerobotics · Mar 3, 2022 · 0f4217d · 0f4217d
1 parent f86c9c2
commit 0f4217d
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(ping-viewer LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CXX_STANDARD_REQUIRED ON)
 
-set(QT_MIN_VERSION "5.15.0")
+set(QT_MIN_VERSION "6.2.0")
 
 set(CMAKE_AUTOMOC ON)
 set(AUTOMOC_MOC_OPTIONS -Muri=org.bluerobotics.pingviewer)
@@ -31,7 +31,7 @@ add_compile_definitions(
     QT_USE_FAST_OPERATOR_PLUS
 )
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
     Charts
     Concurrent
     Core

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,11 +21,11 @@ foreach(directory ${INCLUDE_DIRS})
     add_subdirectory(${directory})
 endforeach()
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
-    QuickCompiler
-)
+#find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
+    #QuickCompiler
+#)
 
-qtquick_compiler_add_resources(RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../resources.qrc)
+#qtquick_compiler_add_resources(RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../resources.qrc)
 
 # Configure icon for mac build
 set(MACOSX_BUNDLE_ICON_FILE icon.icns)
@@ -51,6 +51,7 @@ set(SOURCES
 
 add_executable(pingviewer
     ${SOURCES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../resources.qrc
 )
 
 # Set windows administrator request
@@ -71,13 +72,13 @@ endif()
 target_link_libraries(
     pingviewer
 PRIVATE
-    Qt5::Core
-    Qt5::Qml
-    Qt5::Quick
-    Qt5::QuickControls2
-    Qt5::Charts
-    Qt5::Svg
-    Qt5::Widgets # QApplication
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Quick
+    Qt6::QuickControls2
+    Qt6::Charts
+    Qt6::Svg
+    Qt6::Widgets # QApplication
     ${INCLUDE_DIRS}
     fmt::fmt
 )
@@ -91,14 +92,14 @@ if(NOT WIN32)
     target_link_libraries(
         test
     PRIVATE
-        Qt5::Core
-        Qt5::Qml
-        Qt5::Quick
-        Qt5::QuickControls2
-        Qt5::Charts
-        Qt5::Svg
-        Qt5::Test
-        Qt5::Widgets
+        Qt6::Core
+        Qt6::Qml
+        Qt6::Quick
+        Qt6::QuickControls2
+        Qt6::Charts
+        Qt6::Svg
+        Qt6::Test
+        Qt6::Widgets
         ${INCLUDE_DIRS}
         fmt::fmt
     )

diff --git a/src/commandline/CMakeLists.txt b/src/commandline/CMakeLists.txt
@@ -7,7 +7,7 @@ STATIC
 target_link_libraries(
     commandline
 PRIVATE
-    Qt5::Core
-    Qt5::Network
-    Qt5::Quick
+    Qt6::Core
+    Qt6::Network
+    Qt6::Quick
 )
diff --git a/src/devicemanager/CMakeLists.txt b/src/devicemanager/CMakeLists.txt
@@ -7,8 +7,8 @@ STATIC
 target_link_libraries(
     devicemanager
 PRIVATE
-    Qt5::Core
-    Qt5::Network
-    Qt5::Qml
-    Qt5::Quick
+    Qt6::Core
+    Qt6::Network
+    Qt6::Qml
+    Qt6::Quick
 )
diff --git a/src/filemanager/CMakeLists.txt b/src/filemanager/CMakeLists.txt
@@ -7,7 +7,7 @@ STATIC
 target_link_libraries(
     filemanager
 PRIVATE
-    Qt5::Core
-    Qt5::Quick
+    Qt6::Core
+    Qt6::Quick
     logger
 )
diff --git a/src/flash/CMakeLists.txt b/src/flash/CMakeLists.txt
@@ -7,7 +7,7 @@ STATIC
 target_link_libraries(
     flash
 PRIVATE
-    Qt5::Core
-    Qt5::Gui
-    Qt5::SerialPort
+    Qt6::Core
+    Qt6::Gui
+    Qt6::SerialPort
 )
diff --git a/src/link/CMakeLists.txt b/src/link/CMakeLists.txt
@@ -20,8 +20,8 @@ STATIC
 target_link_libraries(
     link
 PRIVATE
-    Qt5::Core
-    Qt5::Network
-    Qt5::SerialPort
-    Qt5::Gui
+    Qt6::Core
+    Qt6::Network
+    Qt6::SerialPort
+    Qt6::Gui
 )
diff --git a/src/link/linkconfiguration.h b/src/link/linkconfiguration.h
@@ -370,7 +370,7 @@ struct LinkConfigurationRegisterStruct {
 
         const int newId = qRegisterMetaType<LinkConfiguration>("LinkConfiguration");
         metatypeId.storeRelease(newId);
-        qRegisterMetaTypeStreamOperators<LinkConfiguration>("LinkConfiguration");
+        //qRegisterMetaTypeStreamOperators<LinkConfiguration>("LinkConfiguration");
     }
 };
 

diff --git a/src/logger/CMakeLists.txt b/src/logger/CMakeLists.txt
@@ -8,9 +8,9 @@ STATIC
 target_link_libraries(
     logger
 PRIVATE
-    Qt5::Concurrent
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Qml
+    Qt6::Concurrent
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
     filemanager # for the construtor only, perhaps we should remove that dependency.
 )
diff --git a/src/mavlink/CMakeLists.txt b/src/mavlink/CMakeLists.txt
@@ -7,7 +7,7 @@ STATIC
 target_link_libraries(
     mavlink
 PRIVATE
-    Qt5::Core
-    Qt5::Widgets
-    Qt5::Quick
+    Qt6::Core
+    Qt6::Widgets
+    Qt6::Quick
 )
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -8,9 +8,9 @@ STATIC
 target_link_libraries(
     network
 PRIVATE
-    Qt5::Core
-    Qt5::Network
-    Qt5::Gui
-    Qt5::Widgets
-    Qt5::Quick
+    Qt6::Core
+    Qt6::Network
+    Qt6::Gui
+    Qt6::Widgets
+    Qt6::Quick
 )
diff --git a/src/notification/CMakeLists.txt b/src/notification/CMakeLists.txt
@@ -8,7 +8,7 @@ STATIC
 target_link_libraries(
     notification
 PRIVATE
-    Qt5::Core
-    Qt5::Widgets # because of stylemanager.h
-    Qt5::Quick # because of stylemanager.h
+    Qt6::Core
+    Qt6::Widgets # because of stylemanager.h
+    Qt6::Quick # because of stylemanager.h
 )
diff --git a/src/sensor/CMakeLists.txt b/src/sensor/CMakeLists.txt
@@ -16,12 +16,12 @@ STATIC
 target_link_libraries(
     sensor
 PRIVATE
-    Qt5::Core
-    Qt5::Network
-    Qt5::Quick
-    Qt5::SerialPort
-    Qt5::Widgets # because of stylemanager
-    Qt5::Concurrent
+    Qt6::Core
+    Qt6::Network
+    Qt6::Quick
+    Qt6::SerialPort
+    Qt6::Widgets # because of stylemanager
+    Qt6::Concurrent
 
     mavlink
     network

diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
@@ -9,7 +9,7 @@ STATIC
 target_link_libraries(
     settings
 PRIVATE
-    Qt5::Core
-    Qt5::Qml
-    Qt5::Widgets # because of QColor
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Widgets # because of QColor
 )
diff --git a/src/style/CMakeLists.txt b/src/style/CMakeLists.txt
@@ -7,8 +7,8 @@ STATIC
 target_link_libraries(
     style
 PRIVATE
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Widgets
-    Qt5::Qml
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
+    Qt6::Qml
 )
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -7,9 +7,9 @@ STATIC
 target_link_libraries(
     util
 PRIVATE
-    Qt5::Charts
-    Qt5::Core
-    Qt5::Qml
-    Qt5::Widgets
-    Qt5::SerialPort
+    Qt6::Charts
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Widgets
+    Qt6::SerialPort
 )
diff --git a/src/waterfall/CMakeLists.txt b/src/waterfall/CMakeLists.txt
@@ -11,7 +11,7 @@ STATIC
 target_link_libraries(
     waterfall
 PRIVATE
-    Qt5::Concurrent
-    Qt5::Quick
+    Qt6::Concurrent
+    Qt6::Quick
     logger
 )