]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/CMakeLists.txt
projects / dolphin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Port to KF6 rename of KUserFeedback
[dolphin.git] / src / CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca0fbe8f75eabadd1ec0cdb31eff8670ae0255ae..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
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt6::Widgets
 )
 
 set_target_properties(dolphinvcs PROPERTIES
@@ -39,6 +39,7 @@ ecm_generate_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})
 
@@ -82,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
@@ -183,6 +185,7 @@ kconfig_add_kcfg_files(dolphinprivate
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
     settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_contentdisplaysettings.kcfgc
     settings/dolphin_generalsettings.kcfgc
     settings/dolphin_contextmenusettings.kcfgc
     settings/dolphin_versioncontrolsettings.kcfgc
@@ -193,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
@@ -203,12 +206,14 @@ target_link_libraries(
     KF6::Completion
     KF6::TextWidgets
     KF6::ConfigCore
-    KF6::NewStuff
     KF6::NewStuffWidgets    # KNSWidgets::Button
     KF6::Parts
     KF6::WindowSystem
     KF6::WidgetsAddons
     KF6::Codecs
+    KF6::KCMUtils
+
+    ${FTS_LIB}
 )
 
 if(HAVE_BALOO)
@@ -248,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/")
 
 ##########################################
@@ -287,23 +292,22 @@ target_sources(dolphinstatic PRIVATE
     selectionmode/bottombar.cpp
     selectionmode/bottombarcontentscontainer.cpp
     selectionmode/topbar.cpp
-    settings/general/behaviorsettingspage.cpp
-    settings/general/confirmationssettingspage.cpp
-    settings/general/generalsettingspage.cpp
-    settings/general/previewssettingspage.cpp
-    settings/general/statusbarsettingspage.cpp
+    settings/interface/folderstabssettingspage.cpp
+    settings/interface/statusandlocationbarssettingspage.cpp
+    settings/interface/confirmationssettingspage.cpp
+    settings/interface/interfacesettingspage.cpp
+    settings/interface/previewssettingspage.cpp
     settings/dolphinsettingsdialog.cpp
-    settings/navigation/navigationsettingspage.cpp
     settings/contextmenu/contextmenusettingspage.cpp
     settings/settingspagebase.cpp
-    settings/serviceitemdelegate.cpp
     settings/servicemodel.cpp
-    settings/startup/startupsettingspage.cpp
     settings/trash/trashsettingspage.cpp
     settings/viewmodes/dolphinfontrequester.cpp
     settings/viewmodes/viewsettingspage.cpp
     settings/viewmodes/viewmodesettings.cpp
     settings/viewmodes/viewsettingstab.cpp
+    settings/viewmodes/contentdisplaytab.cpp
+    settings/viewmodes/generalviewsettingspage.cpp
     statusbar/dolphinstatusbar.cpp
     statusbar/mountpointobserver.cpp
     statusbar/mountpointobservercache.cpp
@@ -345,23 +349,22 @@ target_sources(dolphinstatic PRIVATE
     selectionmode/bottombar.h
     selectionmode/bottombarcontentscontainer.h
     selectionmode/topbar.h
-    settings/general/behaviorsettingspage.h
-    settings/general/confirmationssettingspage.h
-    settings/general/generalsettingspage.h
-    settings/general/previewssettingspage.h
-    settings/general/statusbarsettingspage.h
+    settings/interface/folderstabssettingspage.h
+    settings/interface/statusandlocationbarssettingspage.h
+    settings/interface/confirmationssettingspage.h
+    settings/interface/interfacesettingspage.h
+    settings/interface/previewssettingspage.h
     settings/dolphinsettingsdialog.h
-    settings/navigation/navigationsettingspage.h
     settings/contextmenu/contextmenusettingspage.h
     settings/settingspagebase.h
-    settings/serviceitemdelegate.h
     settings/servicemodel.h
-    settings/startup/startupsettingspage.h
     settings/trash/trashsettingspage.h
     settings/viewmodes/dolphinfontrequester.h
     settings/viewmodes/viewsettingspage.h
     settings/viewmodes/viewmodesettings.h
     settings/viewmodes/viewsettingstab.h
+    settings/viewmodes/contentdisplaytab.h
+    settings/viewmodes/generalviewsettingspage.h
     statusbar/dolphinstatusbar.h
     statusbar/mountpointobserver.h
     statusbar/mountpointobservercache.h
@@ -406,6 +409,7 @@ kconfig_add_kcfg_files(dolphinstatic
     settings/dolphin_detailsmodesettings.kcfgc
     settings/dolphin_contextmenusettings.kcfgc
     settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_contentdisplaysettings.kcfgc
     search/dolphin_searchsettings.kcfgc
     settings/dolphin_versioncontrolsettings.kcfgc
 )
@@ -429,7 +433,8 @@ target_link_libraries(dolphinstatic
     KF6::KCMUtils
     KF6::DBusAddons
     KF6::Notifications
-    Phonon::phonon4qt${QT_MAJOR_VERSION}
+    KF6::BookmarksWidgets
+    Phonon::phonon4qt6
 )
 
 if (HAVE_KACTIVITIES)
@@ -442,8 +447,8 @@ endif()
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic
-        KUserFeedbackCore
-        KUserFeedbackWidgets
+        KF6::UserFeedbackCore
+        KF6::UserFeedbackWidgets
     )
 endif()
 
@@ -471,11 +476,7 @@ target_link_libraries(dolphin
 )
 
 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)
@@ -494,7 +495,6 @@ install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 if(NOT WIN32)
     # The settings are still accessible from the hamburger menu
     add_library(kcm_dolphinviewmodes MODULE)
-    add_library(kcm_dolphinnavigation MODULE)
     add_library(kcm_dolphingeneral MODULE)
 
     target_sources(kcm_dolphinviewmodes PRIVATE
@@ -502,6 +502,7 @@ if(NOT WIN32)
         settings/viewmodes/dolphinfontrequester.cpp
         settings/viewmodes/viewmodesettings.cpp
         settings/viewmodes/viewsettingstab.cpp
+        settings/settingspagebase.cpp
         views/zoomlevelinfo.cpp
         settings/kcm/kcmdolphinviewmodes.h
         settings/viewmodes/dolphinfontrequester.h
@@ -509,30 +510,33 @@ if(NOT WIN32)
         settings/viewmodes/viewsettingstab.h
         views/zoomlevelinfo.h)
 
-    target_sources(kcm_dolphinnavigation PRIVATE
-        settings/kcm/kcmdolphinnavigation.cpp
-        settings/navigation/navigationsettingspage.cpp
-        settings/settingspagebase.cpp
-        settings/kcm/kcmdolphinnavigation.h
-        settings/navigation/navigationsettingspage.h
-        settings/settingspagebase.h
-    )
-
     target_sources(kcm_dolphingeneral PRIVATE
         settings/kcm/kcmdolphingeneral.cpp
-        settings/general/behaviorsettingspage.cpp
-        settings/general/previewssettingspage.cpp
-        settings/general/confirmationssettingspage.cpp
+        settings/interface/folderstabssettingspage.cpp
+        settings/interface/statusandlocationbarssettingspage.cpp
+        settings/interface/previewssettingspage.cpp
+        settings/interface/confirmationssettingspage.cpp
         settings/settingspagebase.cpp
-        settings/serviceitemdelegate.cpp
         settings/servicemodel.cpp
+        dolphin_generalsettings.cpp
+        dolphindebug.cpp
+        dolphinmainwindowinterface.cpp
+        views/viewproperties.cpp
+        dolphin_directoryviewpropertysettings.cpp
+        global.cpp
         settings/kcm/kcmdolphingeneral.h
-        settings/general/behaviorsettingspage.h
-        settings/general/previewssettingspage.h
-        settings/general/confirmationssettingspage.h
+        settings/interface/folderstabssettingspage.h
+        settings/interface/statusandlocationbarssettingspage.h
+        settings/interface/previewssettingspage.h
+        settings/interface/confirmationssettingspage.h
         settings/settingspagebase.h
-        settings/serviceitemdelegate.h
         settings/servicemodel.h
+        dolphin_generalsettings.h
+        dolphindebug.h
+        dolphinmainwindowinterface.h
+        views/viewproperties.h
+        dolphin_directoryviewpropertysettings.h
+        global.h
     )
 
     kconfig_add_kcfg_files(kcm_dolphinviewmodes
@@ -540,24 +544,20 @@ if(NOT WIN32)
         settings/dolphin_directoryviewpropertysettings.kcfgc
         settings/dolphin_detailsmodesettings.kcfgc
         settings/dolphin_iconsmodesettings.kcfgc
+        settings/dolphin_contentdisplaysettings.kcfgc
         settings/dolphin_generalsettings.kcfgc
         settings/dolphin_versioncontrolsettings.kcfgc
     )
 
-    kconfig_add_kcfg_files(kcm_dolphinnavigation
-        settings/dolphin_generalsettings.kcfgc)
-
     kconfig_add_kcfg_files(kcm_dolphingeneral
         settings/dolphin_generalsettings.kcfgc)
 
     target_link_libraries(kcm_dolphinviewmodes dolphinprivate)
-    target_link_libraries(kcm_dolphinnavigation dolphinprivate)
     target_link_libraries(kcm_dolphingeneral dolphinprivate)
 
     install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
 
     install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )
-    install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )
     install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )
 endif()
 
@@ -582,6 +582,7 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_compactmodesettings.kcfg
                settings/dolphin_iconsmodesettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
+               settings/dolphin_contentdisplaysettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )