Fix ECMPoQmTools when using Qt6

4 files changed, 18 insertions, 14 deletions

diff --git a/modules/ECMPoQmTools.cmake b/modules/ECMPoQmTools.cmake
index bf9efe0e..3b288064 100644
--- a/modules/ECMPoQmTools.cmake
+++ b/modules/ECMPoQmTools.cmake
@@ -145,10 +145,14 @@ function(ecm_process_po_files_as_qm lang)
     endif()
 
     # Find lrelease and lconvert
-    find_package(Qt${QT_MAJOR_VERSION}LinguistTools CONFIG REQUIRED)
+    if (QT_MAJOR_VERSION EQUAL "5")
+        find_package(Qt5LinguistTools CONFIG REQUIRED)
+    else()
+        find_package(Qt6 COMPONENTS LinguistTools CONFIG REQUIRED)
+    endif()
 
-    if(TARGET Qt5::lconvert)
-        set(lconvert_executable Qt5::lconvert)
+    if(TARGET Qt${QT_MAJOR_VERSION}::lconvert)
+        set(lconvert_executable Qt${QT_MAJOR_VERSION}::lconvert)
     else()
         # Qt < 5.3.1 does not define Qt5::lconvert
         get_target_property(lrelease_location Qt5::lrelease LOCATION)
@@ -178,7 +182,7 @@ function(ecm_process_po_files_as_qm lang)
         add_custom_command(OUTPUT ${qm_file}
             COMMAND ${lconvert_executable}
                 ARGS -i ${po_file} -o ${ts_file} -target-language ${lang}
-            COMMAND Qt5::lrelease
+            COMMAND Qt${QT_MAJOR_VERSION}::lrelease
                 ARGS -removeidentical -nounfinished -silent ${ts_file} -qm ${qm_file}
             DEPENDS ${po_file}
             )
diff --git a/tests/ECMPoQmToolsTest/CMakeLists.txt b/tests/ECMPoQmToolsTest/CMakeLists.txt
index e298db9c..d6a228f7 100644
--- a/tests/ECMPoQmToolsTest/CMakeLists.txt
+++ b/tests/ECMPoQmToolsTest/CMakeLists.txt
@@ -66,7 +66,7 @@ unset(LOCALE_INSTALL_DIR)
 #                      #
 ########################
 
-find_package(Qt5Core CONFIG REQUIRED)
+find_package(Qt${QT_MAJOR_VERSION}Core CONFIG REQUIRED)
 ecm_install_po_files_as_qm(tr_test-po)
 
 
@@ -78,7 +78,7 @@ set(tr_test_SRCS
 )
 ecm_create_qm_loader(tr_test_SRCS catalog)
 add_executable(tr_test ${tr_test_SRCS})
-target_link_libraries(tr_test PRIVATE Qt5::Core)
+target_link_libraries(tr_test PRIVATE Qt${QT_MAJOR_VERSION}::Core)
 
 
 #
@@ -86,7 +86,7 @@ target_link_libraries(tr_test PRIVATE Qt5::Core)
 #
 add_executable(tr_test_target tr_test.cpp)
 ecm_create_qm_loader(tr_test_target catalog)
-target_link_libraries(tr_test_target PRIVATE Qt5::Core)
+target_link_libraries(tr_test_target PRIVATE Qt${QT_MAJOR_VERSION}::Core)
 
 
 #
@@ -100,14 +100,14 @@ ecm_create_qm_loader(tr_test_2_SRCS catalog2)
 add_executable(tr_test_2 ${tr_test_2_SRCS})
 set_target_properties(tr_test_2 PROPERTIES AUTOMOC ON)
 target_include_directories(tr_test_2 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
-target_link_libraries(tr_test_2 PRIVATE Qt5::Core)
+target_link_libraries(tr_test_2 PRIVATE Qt${QT_MAJOR_VERSION}::Core)
 
 
 #
 # module for tr_thread_test
 #
 add_library(tr_thread_module MODULE tr_thread_test_module.cpp ${QMLOADER_FILES})
-target_link_libraries(tr_thread_module PRIVATE Qt5::Core)
+target_link_libraries(tr_thread_module PRIVATE Qt${QT_MAJOR_VERSION}::Core)
 
 
 #
@@ -122,7 +122,7 @@ add_executable(tr_thread_test ${tr_thread_test_SRCS})
 set_target_properties(tr_thread_test PROPERTIES AUTOMOC ON)
 target_include_directories(tr_thread_test PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 target_compile_definitions(tr_thread_test PRIVATE "MODULE_PATH=\"$<TARGET_FILE:tr_thread_module>\"")
-target_link_libraries(tr_thread_test PRIVATE Qt5::Core)
+target_link_libraries(tr_thread_test PRIVATE Qt${QT_MAJOR_VERSION}::Core)
 
 
 #
@@ -131,7 +131,7 @@ target_link_libraries(tr_thread_test PRIVATE Qt5::Core)
 #
 # make sure the moc file is only visible to this test/target
 set(MOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test_2_moc")
-qt5_generate_moc(tr_thread_test.cpp "${MOC_DIR}/tr_thread_test.moc")
+qt_generate_moc(tr_thread_test.cpp "${MOC_DIR}/tr_thread_test.moc")
 # Unset SKIP_AUTOMOC again, to not interfer with AUTOMOC as set for tr_thread_test
 set_source_files_properties(tr_thread_test PROPERTIES SKIP_AUTOMOC OFF)
 
@@ -144,7 +144,7 @@ add_executable(tr_thread_test_2 ${tr_thread_test_2_SRCS})
 set_target_properties(tr_thread_test_2 PROPERTIES AUTOMOC OFF)
 target_include_directories(tr_thread_test_2 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}" "${MOC_DIR}")
 target_compile_definitions(tr_thread_test_2 PRIVATE "MODULE_PATH=\"$<TARGET_FILE:tr_thread_module>\"")
-target_link_libraries(tr_thread_test_2 PRIVATE Qt5::Core)
+target_link_libraries(tr_thread_test_2 PRIVATE Qt${QT_MAJOR_VERSION}::Core)
 
 
 #
diff --git a/tests/ECMPoQmToolsTest/check.cmake.in b/tests/ECMPoQmToolsTest/check.cmake.in
index 5d3d8258..927b7391 100644
--- a/tests/ECMPoQmToolsTest/check.cmake.in
+++ b/tests/ECMPoQmToolsTest/check.cmake.in
@@ -74,7 +74,7 @@ if("@CMAKE_SYSTEM_NAME@" STREQUAL "Linux")
         foreach(lang en de de_AT fr)
             execute_process(
                 COMMAND "${CMAKE_COMMAND}" -E env "XDG_DATA_DIRS=${ACTUAL_TREE}/share"
-                    LANGUAGE=${lang} "${exec}"
+                    LANG=${lang} "${exec}"
                 OUTPUT_VARIABLE output
             )
             string(STRIP "${output}" stripped_output)
diff --git a/tests/ECMPoQmToolsTest/subdir/CMakeLists.txt b/tests/ECMPoQmToolsTest/subdir/CMakeLists.txt
index ee06b971..567161c8 100644
--- a/tests/ECMPoQmToolsTest/subdir/CMakeLists.txt
+++ b/tests/ECMPoQmToolsTest/subdir/CMakeLists.txt
@@ -2,4 +2,4 @@
 # want people to do, but it's unfortunately something projects have done and we
 # need to keep them building
 add_executable(tr_test_subdir ../tr_test.cpp ${QMLOADER_FILES})
-target_link_libraries(tr_test_subdir PRIVATE Qt5::Core)
+target_link_libraries(tr_test_subdir PRIVATE Qt${QT_MAJOR_VERSION}::Core)