Use Qt:: directly

autotests/CMakeLists.txt

@@ -3,12 +3,12 @@
 
 add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") # TODO use QFINDTESTDATA instead
 
-ecm_add_test(parsertest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
-ecm_add_test(jsonldtest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
+ecm_add_test(parsertest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
+ecm_add_test(jsonldtest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
 if (NOT VALIDATOR_ONLY)
-ecm_add_test(intervaltest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
-ecm_add_test(eastertest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
-ecm_add_test(evaluatetest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
-ecm_add_test(iterationtest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
-ecm_add_test(intervalmodeltest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KOpeningHours)
+ecm_add_test(intervaltest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
+ecm_add_test(eastertest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
+ecm_add_test(evaluatetest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
+ecm_add_test(iterationtest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
+ecm_add_test(intervalmodeltest.cpp LINK_LIBRARIES Qt::Test KOpeningHours)
 endif()

src/CMakeLists.txt

@@ -4,6 +4,6 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kopeninghours\")
 
 add_subdirectory(lib)
-if (TARGET Qt${QT_MAJOR_VERSION}::Qml AND NOT VALIDATOR_ONLY)
+if (TARGET Qt::Qml AND NOT VALIDATOR_ONLY)
     add_subdirectory(qml)
 endif()

src/lib/CMakeLists.txt

@@ -53,7 +53,7 @@ set_target_properties(KOpeningHours PROPERTIES
 )
 target_link_libraries(KOpeningHours
     PUBLIC
-        Qt${QT_MAJOR_VERSION}::Core
+        Qt::Core
 )
 if (VALIDATOR_ONLY)
     target_compile_definitions(KOpeningHours PUBLIC KOPENINGHOURS_VALIDATOR_ONLY)

src/qml/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 add_library(kopeninghoursqmlplugin kopeninghoursqmlplugin.cpp)
 target_link_libraries(kopeninghoursqmlplugin
-    Qt${QT_MAJOR_VERSION}::Qml
+    Qt::Qml
     KOpeningHours
 )