3 files changed, 25 insertions, 10 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b3e7b1..b0333a4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,8 +13,14 @@ add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/data")
 find_package(KF5 COMPONENTS REQUIRED Mime)
 
 add_library(sink_test SHARED testimplementations.cpp getrssusage.cpp mailtest.cpp mailsynctest.cpp mailthreadtest.cpp)
-qt5_use_modules(sink_test Core Test Concurrent)
-target_link_libraries(sink_test sink libhawd KF5::Mime)
+target_link_libraries(sink_test
+    sink
+    libhawd
+    Qt5::Core
+    Qt5::Concurrent
+    Qt5::Test
+    KF5::Mime
+)
 
 add_executable(dbwriter dbwriter.cpp)
 target_link_libraries(dbwriter sink)
diff --git a/tests/SinkTest.cmake b/tests/SinkTest.cmake
index 03076e7..4eb8f43 100644
--- a/tests/SinkTest.cmake
+++ b/tests/SinkTest.cmake
@@ -17,8 +17,13 @@ macro(auto_tests)
         add_executable(${_testname} ${_testname}.cpp)
         add_test(${_testname} ${_testname})
         add_memcheck_test(${_testname} ${_testname})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd sink_test)
+        target_link_libraries(${_testname}
+            sink libhawd
+            sink_test
+            Qt5::Core
+            Qt5::Concurrent
+            Qt5::Test
+        )
     endforeach(_testname)
 endmacro(auto_tests)
 
@@ -26,7 +31,13 @@ macro(manual_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp)
         add_memcheck_test(${_testname} ${_testname})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd sink_test)
+        target_link_libraries(${_testname}
+            sink
+            libhawd
+            sink_test
+            Qt5::Core
+            Qt5::Concurrent
+            Qt5::Test
+        )
     endforeach(_testname)
 endmacro(manual_tests)
diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index 6ae5f13..7546920 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -27,8 +27,7 @@ set(SRCS
 
 add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS})
 generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h)
-qt5_use_modules(lib${PROJECT_NAME} Core)
-target_link_libraries(lib${PROJECT_NAME} sink)
+target_link_libraries(lib${PROJECT_NAME} sink Qt5::Core)
 if (LIBGIT2_FOUND)
    target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)
@@ -36,8 +35,7 @@ endif(LIBGIT2_FOUND)
 install(TARGETS lib${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_executable(${PROJECT_NAME} ${SRCS})
-qt5_use_modules(${PROJECT_NAME} Core)
-target_link_libraries(${PROJECT_NAME} lib${PROJECT_NAME})
+target_link_libraries(${PROJECT_NAME} lib${PROJECT_NAME} Qt5::Core)
 if (LIBGIT2_FOUND)
    target_link_libraries(${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)