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/CMakeLists.txt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d78b05f91..0792af0c0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ generate_export_header(dolphinvcs BASE_NAME dolphinvcs) target_link_libraries( dolphinvcs PUBLIC - Qt${QT_MAJOR_VERSION}::Widgets + Qt6::Widgets ) set_target_properties(dolphinvcs PROPERTIES @@ -195,8 +195,8 @@ generate_export_header(dolphinprivate BASE_NAME dolphin) target_link_libraries( dolphinprivate PUBLIC dolphinvcs - Qt${QT_MAJOR_VERSION}::Concurrent - Qt${QT_MAJOR_VERSION}::Gui + Qt6::Concurrent + Qt6::Gui KF6::I18n KF6::IconThemes KF6::KIOCore @@ -254,7 +254,7 @@ target_link_libraries(dolphinpart dolphinprivate ) -install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts) +install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/parts) install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dolphin/") ########################################## @@ -435,7 +435,7 @@ target_link_libraries(dolphinstatic KF6::DBusAddons KF6::Notifications KF6::BookmarksWidgets - Phonon::phonon4qt${QT_MAJOR_VERSION} + Phonon::phonon4qt6 ) if (HAVE_KACTIVITIES) @@ -477,11 +477,7 @@ target_link_libraries(dolphin ) if (HAVE_X11) - if (QT_MAJOR_VERSION STREQUAL "5") - target_link_libraries(dolphin PRIVATE Qt{QT_MAJOR_VERSION}::X11Extras) - else() - target_link_libraries(dolphin PRIVATE Qt::GuiPrivate) - endif() + target_link_libraries(dolphin PRIVATE Qt::GuiPrivate) endif() include(DbusInterfaceMacros) -- cgit v1.3.1