Port to KF6 rename of KUserFeedback

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd9abec81daef9ede99603c130200924bd995cab..be83cd2d0a56b420d556b0f6cabea52d144040bb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ generate_export_header(dolphinvcs BASE_NAME dolphinvcs)
 
 target_link_libraries(
     dolphinvcs PUBLIC
 
 target_link_libraries(
     dolphinvcs PUBLIC

-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt6::Widgets

 )
 
 set_target_properties(dolphinvcs PROPERTIES
 )
 
 set_target_properties(dolphinvcs PROPERTIES


@@ -39,6 +39,7 @@ ecm_generate_headers(dolphinvcs_LIB_HEADERS
     RELATIVE "views/versioncontrol"
     REQUIRED_HEADERS dolphinvcs_LIB_HEADERS
 )
     RELATIVE "views/versioncontrol"
     REQUIRED_HEADERS dolphinvcs_LIB_HEADERS
 )

+target_include_directories(dolphinvcs INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}>")

 
 install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 


@@ -82,6 +83,7 @@ target_sources(dolphinprivate PRIVATE
     kitemviews/private/kitemlistsmoothscroller.cpp
     kitemviews/private/kitemlistviewanimation.cpp
     kitemviews/private/kitemlistviewlayouter.cpp
     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
     kitemviews/private/kpixmapmodifier.cpp
     settings/applyviewpropsjob.cpp
     settings/viewmodes/viewmodesettings.cpp


@@ -194,30 +196,32 @@ generate_export_header(dolphinprivate BASE_NAME dolphin)
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs

-    Qt${QT_MAJOR_VERSION}::Concurrent
-    Qt${QT_MAJOR_VERSION}::Gui
-    KF5::I18n
-    KF5::IconThemes
-    KF5::KIOCore
-    KF5::KIOWidgets
-    KF5::KIOFileWidgets
-    KF5::Completion
-    KF5::TextWidgets
-    KF5::ConfigCore
-    KF5::NewStuff
-    KF5::NewStuffWidgets    # KNSWidgets::Button
-    KF5::Parts
-    KF5::WindowSystem
-    KF5::WidgetsAddons
-    KF5::Codecs
+    Qt6::Concurrent
+    Qt6::Gui
+    KF6::I18n
+    KF6::IconThemes
+    KF6::KIOCore
+    KF6::KIOWidgets
+    KF6::KIOFileWidgets
+    KF6::Completion
+    KF6::TextWidgets
+    KF6::ConfigCore
+    KF6::NewStuffWidgets    # KNSWidgets::Button
+    KF6::Parts
+    KF6::WindowSystem
+    KF6::WidgetsAddons
+    KF6::Codecs
+    KF6::KCMUtils
+
+    ${FTS_LIB}

 )
 
 if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC
 )
 
 if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC

-        KF5::FileMetaData
-        KF5::Baloo
-        KF5::BalooWidgets
+        KF6::FileMetaData
+        KF6::Baloo
+        KF6::BalooWidgets

     )
 endif()
 
     )
 endif()
 


@@ -249,7 +253,7 @@ target_link_libraries(dolphinpart
     dolphinprivate
 )
 
     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/")
 
 ##########################################
 install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dolphin/")
 
 ##########################################


@@ -290,14 +294,12 @@ target_sources(dolphinstatic PRIVATE
     selectionmode/topbar.cpp
     settings/interface/folderstabssettingspage.cpp
     settings/interface/statusandlocationbarssettingspage.cpp
     selectionmode/topbar.cpp
     settings/interface/folderstabssettingspage.cpp
     settings/interface/statusandlocationbarssettingspage.cpp

-    settings/interface/configurepreviewplugindialog.cpp

     settings/interface/confirmationssettingspage.cpp
     settings/interface/interfacesettingspage.cpp
     settings/interface/previewssettingspage.cpp
     settings/dolphinsettingsdialog.cpp
     settings/contextmenu/contextmenusettingspage.cpp
     settings/settingspagebase.cpp
     settings/interface/confirmationssettingspage.cpp
     settings/interface/interfacesettingspage.cpp
     settings/interface/previewssettingspage.cpp
     settings/dolphinsettingsdialog.cpp
     settings/contextmenu/contextmenusettingspage.cpp
     settings/settingspagebase.cpp

-    settings/serviceitemdelegate.cpp

     settings/servicemodel.cpp
     settings/trash/trashsettingspage.cpp
     settings/viewmodes/dolphinfontrequester.cpp
     settings/servicemodel.cpp
     settings/trash/trashsettingspage.cpp
     settings/viewmodes/dolphinfontrequester.cpp


@@ -349,14 +351,12 @@ target_sources(dolphinstatic PRIVATE
     selectionmode/topbar.h
     settings/interface/folderstabssettingspage.h
     settings/interface/statusandlocationbarssettingspage.h
     selectionmode/topbar.h
     settings/interface/folderstabssettingspage.h
     settings/interface/statusandlocationbarssettingspage.h

-    settings/interface/configurepreviewplugindialog.h

     settings/interface/confirmationssettingspage.h
     settings/interface/interfacesettingspage.h
     settings/interface/previewssettingspage.h
     settings/dolphinsettingsdialog.h
     settings/contextmenu/contextmenusettingspage.h
     settings/settingspagebase.h
     settings/interface/confirmationssettingspage.h
     settings/interface/interfacesettingspage.h
     settings/interface/previewssettingspage.h
     settings/dolphinsettingsdialog.h
     settings/contextmenu/contextmenusettingspage.h
     settings/settingspagebase.h

-    settings/serviceitemdelegate.h

     settings/servicemodel.h
     settings/trash/trashsettingspage.h
     settings/viewmodes/dolphinfontrequester.h
     settings/servicemodel.h
     settings/trash/trashsettingspage.h
     settings/viewmodes/dolphinfontrequester.h


@@ -429,25 +429,26 @@ target_sources(dolphinstatic PRIVATE
 target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate
 target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate

-    KF5::CoreAddons
-    KF5::KCMUtils
-    KF5::DBusAddons
-    KF5::Notifications
-    Phonon::phonon4qt${QT_MAJOR_VERSION}
+    KF6::CoreAddons
+    KF6::KCMUtils
+    KF6::DBusAddons
+    KF6::Notifications
+    KF6::BookmarksWidgets
+    Phonon::phonon4qt6

 )
 
 if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic
 )
 
 if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic

-        KF5::Activities
+        KF6::Activities

     )
 endif()
 
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic
     )
 endif()
 
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic

-        KUserFeedbackCore
-        KUserFeedbackWidgets
+        KF6::UserFeedbackCore
+        KF6::UserFeedbackWidgets

     )
 endif()
 
     )
 endif()
 


@@ -471,15 +472,11 @@ target_link_libraries(dolphin
     PRIVATE
     dolphinprivate
     dolphinstatic
     PRIVATE
     dolphinprivate
     dolphinstatic

-    KF5::Crash
+    KF6::Crash

 )
 
 if (HAVE_X11)
 )
 
 if (HAVE_X11)

-    if (QT_MAJOR_VERSION STREQUAL "5")
-        target_link_libraries(dolphin PRIVATE Qt5::X11Extras)
-    else()
-        target_link_libraries(dolphin PRIVATE Qt::GuiPrivate)
-    endif()
+    target_link_libraries(dolphin PRIVATE Qt::GuiPrivate)

 endif()
 
 include(DbusInterfaceMacros)
 endif()
 
 include(DbusInterfaceMacros)


@@ -518,10 +515,8 @@ if(NOT WIN32)
         settings/interface/folderstabssettingspage.cpp
         settings/interface/statusandlocationbarssettingspage.cpp
         settings/interface/previewssettingspage.cpp
         settings/interface/folderstabssettingspage.cpp
         settings/interface/statusandlocationbarssettingspage.cpp
         settings/interface/previewssettingspage.cpp

-        settings/interface/configurepreviewplugindialog.cpp

         settings/interface/confirmationssettingspage.cpp
         settings/settingspagebase.cpp
         settings/interface/confirmationssettingspage.cpp
         settings/settingspagebase.cpp

-        settings/serviceitemdelegate.cpp

         settings/servicemodel.cpp
         dolphin_generalsettings.cpp
         dolphindebug.cpp
         settings/servicemodel.cpp
         dolphin_generalsettings.cpp
         dolphindebug.cpp


@@ -533,10 +528,8 @@ if(NOT WIN32)
         settings/interface/folderstabssettingspage.h
         settings/interface/statusandlocationbarssettingspage.h
         settings/interface/previewssettingspage.h
         settings/interface/folderstabssettingspage.h
         settings/interface/statusandlocationbarssettingspage.h
         settings/interface/previewssettingspage.h

-        settings/interface/configurepreviewplugindialog.h

         settings/interface/confirmationssettingspage.h
         settings/settingspagebase.h
         settings/interface/confirmationssettingspage.h
         settings/settingspagebase.h

-        settings/serviceitemdelegate.h

         settings/servicemodel.h
         dolphin_generalsettings.h
         dolphindebug.h
         settings/servicemodel.h
         dolphin_generalsettings.h
         dolphindebug.h