From 1cf56b2303fea11a6686b1da6355e113f8ab78b7 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 8 Nov 2023 07:23:16 +0100 Subject: Master is qt6 only. Not necessary to use ${QT_MAJOR_VERSION} now. Remove qt5 specific cmake code too --- src/tests/CMakeLists.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/tests') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 6431ff3fa..949fd52b3 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,73 +1,73 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -find_package(Qt${QT_MAJOR_VERSION}Test CONFIG REQUIRED) +find_package(Qt6Test CONFIG REQUIRED) include(ECMAddTests) include(FindGem) # For servicemenutest, see bottom of this file # KItemSetTest -ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test) # KItemRangeTest -ecm_add_test(kitemrangetest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +ecm_add_test(kitemrangetest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test) # KItemListSelectionManagerTest -ecm_add_test(kitemlistselectionmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +ecm_add_test(kitemlistselectionmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test) # KItemListControllerTest ecm_add_test(kitemlistcontrollertest.cpp testdir.cpp TEST_NAME kitemlistcontrollertest -LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +LINK_LIBRARIES dolphinprivate Qt6::Test) # KItemListControllerExpandTest ecm_add_test(kitemlistcontrollerexpandtest.cpp testdir.cpp TEST_NAME kitemlistcontrollerexpandtest -LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +LINK_LIBRARIES dolphinprivate Qt6::Test) # KFileItemListViewTest ecm_add_test(kfileitemlistviewtest.cpp testdir.cpp TEST_NAME kfileitemlistviewtest -LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +LINK_LIBRARIES dolphinprivate Qt6::Test) # KFileItemModelTest ecm_add_test(kfileitemmodeltest.cpp testdir.cpp TEST_NAME kfileitemmodeltest -LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) +LINK_LIBRARIES dolphinprivate dolphinstatic Qt6::Test) # KFileItemModelBenchmark, not run automatically with `ctest` or `make test` add_executable(kfileitemmodelbenchmark kfileitemmodelbenchmark.cpp testdir.cpp) -target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt6::Test) # KItemListKeyboardSearchManagerTest -ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test) # DolphinSearchBox if (KF6Baloo_FOUND) ecm_add_test(dolphinsearchboxtest.cpp TEST_NAME dolphinsearchboxtest - LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) + LINK_LIBRARIES dolphinprivate dolphinstatic Qt6::Test) endif() # DolphinQuery if (KF6Baloo_FOUND) ecm_add_test(dolphinquerytest.cpp TEST_NAME dolphinquerytest - LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) + LINK_LIBRARIES dolphinprivate dolphinstatic Qt6::Test) endif() # ViewPropertiesTest ecm_add_test(viewpropertiestest.cpp testdir.cpp TEST_NAME viewpropertiestest -LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) +LINK_LIBRARIES dolphinprivate dolphinstatic Qt6::Test) # DolphinMainWindowTest ecm_add_test(dolphinmainwindowtest.cpp testdir.cpp ${CMAKE_SOURCE_DIR}/src/dolphin.qrc TEST_NAME dolphinmainwindowtest -LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) +LINK_LIBRARIES dolphinprivate dolphinstatic Qt6::Test) # DragAndDropHelperTest -ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test) +ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test) find_gem(test-unit) set_package_properties(Gem:test-unit PROPERTIES -- cgit v1.3