chore: upgrade to Qt 6

mariokonrad · Oct 7, 2024 · 12d5585 · 12d5585
1 parent e119e44
commit 12d5585
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,12 +50,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/share/${PROJECT_NAME}/lang)
 
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Multimedia REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets Gui Multimedia Network LinguistTools)
 
 ### internationalization
 set(TRANSLATION_FILES
@@ -65,7 +60,7 @@ set(TRANSLATION_FILES
 add_custom_target(language-update)
 foreach(filename ${TRANSLATION_FILES})
 	add_custom_command(TARGET language-update PRE_BUILD
-		COMMAND ${Qt5_LUPDATE_EXECUTABLE} -no-obsolete -recursive ${CMAKE_CURRENT_SOURCE_DIR}/src -ts ${filename}
+		COMMAND ${Qt6_LUPDATE_EXECUTABLE} -no-obsolete -recursive ${CMAKE_CURRENT_SOURCE_DIR}/src -ts ${filename}
 		)
 endforeach()
 

diff --git a/CPack.local.cmake b/CPack.local.cmake
@@ -43,7 +43,7 @@ elseif(UNIX)
 	set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_DEBIAN_PACKAGE_NAME})
 	set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
 	set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACAKGE_DESCRIPTION})
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a, libqt5widgets5, libqt5gui5, libqt5multimedia5, libqt5network5")
+	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6core6a, libqt6widgets6, libqt6gui6, libqt6multimedia6, libqt6network6")
 	set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
 	if(CMAKE_SIZEOF_VOID_P MATCHES "8")
 		set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")

diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
@@ -21,7 +21,7 @@ target_include_directories(engine
 	PUBLIC
 		${CMAKE_CURRENT_SOURCE_DIR}/..
 	PRIVATE
-		${Qt5Core_INCLUDE_DIRS}
+		${Qt6Core_INCLUDE_DIRS}
 	)
 
 target_link_libraries(engine

diff --git a/src/vhf/CMakeLists.txt b/src/vhf/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
+qt6_add_translation(QM_FILES ${TRANSLATION_FILES})
 
 add_executable(vhf-sim WIN32 MACOSX_BUNDLE)
 
@@ -86,32 +86,32 @@ target_compile_options(vhf-sim
 	PRIVATE
 		-Wall
 		-Wextra
-		${Qt5Core_EXECUTABLE_COMPILE_FLAGS}
-		${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}
-		${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}
-		${Qt5Multimedia_EXECUTABLE_COMPILE_FLAGS}
+		${Qt6Core_EXECUTABLE_COMPILE_FLAGS}
+		${Qt6Gui_EXECUTABLE_COMPILE_FLAGS}
+		${Qt6Widgets_EXECUTABLE_COMPILE_FLAGS}
+		${Qt6Multimedia_EXECUTABLE_COMPILE_FLAGS}
 	)
 
 target_include_directories(vhf-sim
 	PRIVATE
 		${CMAKE_CURRENT_BINARY_DIR}
 		${CMAKE_CURRENT_BINARY_DIR}/..
-		${Qt5Core_INCLUDE_DIRS}
-		${Qt5Gui_INCLUDE_DIRS}
-		${Qt5Widgets_INCLUDE_DIRS}
-		${Qt5Multimedia_INCLUDE_DIRS}
+		${Qt6Core_INCLUDE_DIRS}
+		${Qt6Gui_INCLUDE_DIRS}
+		${Qt6Widgets_INCLUDE_DIRS}
+		${Qt6Multimedia_INCLUDE_DIRS}
 	)
 
 target_link_libraries(vhf-sim
 	PRIVATE
 		nmea
 		engine
 		lua
-		Qt5::Core
-		Qt5::Widgets
-		Qt5::Gui
-		Qt5::Multimedia
-		Qt5::Network
+		Qt6::Core
+		Qt6::Widgets
+		Qt6::Gui
+		Qt6::Multimedia
+		Qt6::Network
 	)
 
 install(

diff --git a/src/vhf/MainWindow.cpp b/src/vhf/MainWindow.cpp
@@ -357,7 +357,7 @@ void MainWindow::on_about()
 {
 	QString authors;
 	for (auto const & author :
-		QString {version::git_authors()}.split(";", QString::SkipEmptyParts)) {
+		QString {version::git_authors()}.split(";", Qt::SkipEmptyParts)) {
 		authors += "\n- " + author;
 	}