Migrated from Qt5(Kf5 to Qt6/Kf6 in cmake-files

This commit is contained in:
Magnus Hellströmer
2024-09-08 19:20:52 +02:00
parent 8c3343795a
commit d07214ab92
8 changed files with 27 additions and 40 deletions

View File

@@ -45,7 +45,6 @@ if(NOT DEFINED QT_VERSION_MAJOR)
QT
NAMES
Qt6
Qt5
COMPONENTS
${QET_COMPONENTS}
REQUIRED
@@ -88,7 +87,7 @@ target_link_libraries(
PUBLIC
Catch2::Catch2
PRIVATE
${KF5_PRIVATE_LIBRARIES}
${KF6_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES})
if (DEFINED ENV{CATCH_INCLUDE_DIR})

View File

@@ -45,7 +45,6 @@ if(NOT DEFINED QT_VERSION_MAJOR)
QT
NAMES
Qt6
Qt5
COMPONENTS
${QET_COMPONENTS}
REQUIRED
@@ -85,6 +84,6 @@ target_link_libraries(
PUBLIC
gmock gmock_main
PRIVATE
${KF5_PRIVATE_LIBRARIES}
${KF6_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES})

View File

@@ -45,7 +45,6 @@ if(NOT DEFINED QT_VERSION_MAJOR)
QT
NAMES
Qt6
Qt5
COMPONENTS
${QET_COMPONENTS}
REQUIRED
@@ -84,6 +83,6 @@ target_link_libraries(
PUBLIC
gtest gtest_main
PRIVATE
${KF5_PRIVATE_LIBRARIES}
${KF6_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES})

View File

@@ -45,7 +45,6 @@ if(NOT DEFINED QT_VERSION_MAJOR)
QT
NAMES
Qt6
Qt5
COMPONENTS
${QET_COMPONENTS}
Test
@@ -74,6 +73,6 @@ target_link_libraries(
${PROJECT_NAME}
PRIVATE
Qt::Test
${KF5_PRIVATE_LIBRARIES}
${KF6_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES})