X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/30a807e44afb334dd153c8bcbdbde4f36942bee0..9c313813f58cc43acf973464c338b4de56156f1f:/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a229f6a7..533b5d221 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 @@ -83,6 +83,7 @@ target_sources(dolphinprivate PRIVATE kitemviews/private/kitemlistsmoothscroller.cpp kitemviews/private/kitemlistviewanimation.cpp kitemviews/private/kitemlistviewlayouter.cpp + kitemviews/private/kitemviewsutils.cpp kitemviews/private/kpixmapmodifier.cpp settings/applyviewpropsjob.cpp settings/viewmodes/viewmodesettings.cpp @@ -195,8 +196,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 @@ -212,8 +213,6 @@ target_link_libraries( KF6::Codecs KF6::KCMUtils - KF6::MoreTools - ${FTS_LIB} ) @@ -254,7 +253,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/") ########################################## @@ -434,21 +433,22 @@ target_link_libraries(dolphinstatic KF6::KCMUtils KF6::DBusAddons KF6::Notifications - Phonon::phonon4qt${QT_MAJOR_VERSION} + KF6::BookmarksWidgets + Phonon::phonon4qt6 ) -if (HAVE_KACTIVITIES) +if (HAVE_PLASMA_ACTIVITIES) target_link_libraries( dolphinstatic - KF6::Activities + Plasma::Activities ) endif() if (HAVE_KUSERFEEDBACK) target_link_libraries( dolphinstatic - KUserFeedbackCoreQt6 - KUserFeedbackWidgetsQt6 + KF6::UserFeedbackCore + KF6::UserFeedbackWidgets ) endif() @@ -476,11 +476,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)