]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/CMakeLists.txt
Port to Qt6
[dolphin.git] / src / CMakeLists.txt
index 755fbaa13e472d2d74b6b890cad93d35e9e4beef..fedf96688f77845c7532c0f122a5db6fe868320d 100644 (file)
@@ -1,14 +1,6 @@
 include(ECMAddAppIcon)
 
-configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
-
-configure_file(config-kactivities.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kactivities.h)
-
-configure_file(config-packagekit.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-packagekit.h)
-
-configure_file(config-terminal.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-terminal.h)
-
-configure_file(config-kuserfeedback.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kuserfeedback.h)
+configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"
@@ -21,20 +13,21 @@ remove_definitions(
 
 ##########################################
 
-set(dolphinvcs_LIB_SRCS
+add_library(dolphinvcs SHARED)
+
+target_sources(dolphinvcs PRIVATE
     views/versioncontrol/kversioncontrolplugin.cpp
 )
 
-add_library(dolphinvcs ${dolphinvcs_LIB_SRCS})
 generate_export_header(dolphinvcs BASE_NAME dolphinvcs)
 
 target_link_libraries(
     dolphinvcs PUBLIC
-    Qt5::Widgets
+    Qt${QT_MAJOR_VERSION}::Widgets
 )
 
 set_target_properties(dolphinvcs PROPERTIES
-    VERSION ${DOLPHINVCS_VERSION_STRING}
+    VERSION ${DOLPHINVCS_VERSION}
     SOVERSION ${DOLPHINVCS_SOVERSION}
     EXPORT_NAME DolphinVcs
 )
@@ -49,15 +42,17 @@ ecm_generate_headers(dolphinvcs_LIB_HEADERS
 
 install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
 install(FILES ${dolphinvcs_LIB_HEADERS} DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin" COMPONENT Devel)
 
 ########### next target ###############
 
-set(dolphinprivate_LIB_SRCS
+add_library(dolphinprivate SHARED)
+
+target_sources(dolphinprivate PRIVATE
     kitemviews/kfileitemlistview.cpp
     kitemviews/kfileitemlistwidget.cpp
+    kitemviews/kfileitemlisttostring.cpp
     kitemviews/kfileitemmodel.cpp
     kitemviews/kfileitemmodelrolesupdater.cpp
     kitemviews/kitemlistcontainer.cpp
@@ -71,15 +66,12 @@ set(dolphinprivate_LIB_SRCS
     kitemviews/kitemlistwidget.cpp
     kitemviews/kitemmodelbase.cpp
     kitemviews/kitemset.cpp
-    kitemviews/kstandarditem.cpp
     kitemviews/kstandarditemlistgroupheader.cpp
     kitemviews/kstandarditemlistwidget.cpp
     kitemviews/kstandarditemlistview.cpp
-    kitemviews/kstandarditemmodel.cpp
     kitemviews/private/kdirectorycontentscounter.cpp
     kitemviews/private/kdirectorycontentscounterworker.cpp
     kitemviews/private/kfileitemclipboard.cpp
-    kitemviews/private/kfileitemmodeldirlister.cpp
     kitemviews/private/kfileitemmodelfilter.cpp
     kitemviews/private/kitemlistheaderwidget.cpp
     kitemviews/private/kitemlistkeyboardsearchmanager.cpp
@@ -91,12 +83,11 @@ set(dolphinprivate_LIB_SRCS
     kitemviews/private/kitemlistviewanimation.cpp
     kitemviews/private/kitemlistviewlayouter.cpp
     kitemviews/private/kpixmapmodifier.cpp
-    kitemviews/private/ktwofingerswipe.cpp
-    kitemviews/private/ktwofingertap.cpp
     settings/applyviewpropsjob.cpp
     settings/viewmodes/viewmodesettings.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
+    selectionmode/actiontexthelper.cpp
     views/dolphinfileitemlistwidget.cpp
     views/dolphinitemlistview.cpp
     views/dolphinnewfilemenuobserver.cpp
@@ -112,21 +103,82 @@ set(dolphinprivate_LIB_SRCS
     dolphinremoveaction.cpp
     middleclickactioneventfilter.cpp
     dolphinnewfilemenu.cpp
+
+    kitemviews/kfileitemlistview.h
+    kitemviews/kfileitemlistwidget.h
+    kitemviews/kfileitemlisttostring.h
+    kitemviews/kfileitemmodel.h
+    kitemviews/kfileitemmodelrolesupdater.h
+    kitemviews/kitemlistcontainer.h
+    kitemviews/kitemlistcontroller.h
+    kitemviews/kitemlistgroupheader.h
+    kitemviews/kitemlistheader.h
+    kitemviews/kitemlistselectionmanager.h
+    kitemviews/kitemliststyleoption.h
+    kitemviews/kitemlistview.h
+    kitemviews/kitemlistviewaccessible.h
+    kitemviews/kitemlistwidget.h
+    kitemviews/kitemmodelbase.h
+    kitemviews/kitemset.h
+    kitemviews/kstandarditemlistgroupheader.h
+    kitemviews/kstandarditemlistwidget.h
+    kitemviews/kstandarditemlistview.h
+    kitemviews/private/kdirectorycontentscounter.h
+    kitemviews/private/kdirectorycontentscounterworker.h
+    kitemviews/private/kfileitemclipboard.h
+    kitemviews/private/kfileitemmodelfilter.h
+    kitemviews/private/kitemlistheaderwidget.h
+    kitemviews/private/kitemlistkeyboardsearchmanager.h
+    kitemviews/private/kitemlistroleeditor.h
+    kitemviews/private/kitemlistrubberband.h
+    kitemviews/private/kitemlistselectiontoggle.h
+    kitemviews/private/kitemlistsizehintresolver.h
+    kitemviews/private/kitemlistsmoothscroller.h
+    kitemviews/private/kitemlistviewanimation.h
+    kitemviews/private/kitemlistviewlayouter.h
+    kitemviews/private/kpixmapmodifier.h
+    settings/applyviewpropsjob.h
+    settings/viewmodes/viewmodesettings.h
+    settings/viewpropertiesdialog.h
+    settings/viewpropsprogressinfo.h
+    selectionmode/actiontexthelper.h
+    views/dolphinfileitemlistwidget.h
+    views/dolphinitemlistview.h
+    views/dolphinnewfilemenuobserver.h
+    views/dolphinremoteencoding.h
+    views/dolphinview.h
+    views/dolphinviewactionhandler.h
+    views/draganddrophelper.h
+    views/versioncontrol/updateitemstatesthread.h
+    views/versioncontrol/versioncontrolobserver.h
+    views/viewmodecontroller.h
+    views/viewproperties.h
+    views/zoomlevelinfo.h
+    dolphinremoveaction.h
+    middleclickactioneventfilter.h
+    dolphinnewfilemenu.h
 )
 
-ecm_qt_declare_logging_category(dolphinprivate_LIB_SRCS HEADER dolphindebug.h IDENTIFIER DolphinDebug CATEGORY_NAME org.kde.dolphin
-    DESCRIPTION "dolphin" EXPORT DOLPHIN)
+ecm_qt_declare_logging_category(dolphinprivate
+    HEADER dolphindebug.h
+    IDENTIFIER DolphinDebug
+    CATEGORY_NAME org.kde.dolphin
+    DESCRIPTION "dolphin"
+    EXPORT DOLPHIN
+)
 
 if(HAVE_BALOO)
-    set(dolphinprivate_LIB_SRCS
-        ${dolphinprivate_LIB_SRCS}
+    target_sources(dolphinprivate PRIVATE
         views/tooltips/dolphinfilemetadatawidget.cpp
         views/tooltips/tooltipmanager.cpp
         kitemviews/private/kbaloorolesprovider.cpp
+        views/tooltips/dolphinfilemetadatawidget.h
+        views/tooltips/tooltipmanager.h
+        kitemviews/private/kbaloorolesprovider.h
     )
 endif()
 
-kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
+kconfig_add_kcfg_files(dolphinprivate
     settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
@@ -136,38 +188,42 @@ kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
     settings/dolphin_versioncontrolsettings.kcfgc
 )
 
-add_library(dolphinprivate ${dolphinprivate_LIB_SRCS})
 generate_export_header(dolphinprivate BASE_NAME dolphin)
 
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
-    Qt5::Concurrent
-    Qt5::Gui
-    KF5::I18n
-    KF5::IconThemes
-    KF5::KIOCore
-    KF5::KIOWidgets
-    KF5::KIOFileWidgets
-    KF5::Completion
-    KF5::TextWidgets
-    KF5::ConfigCore
-    KF5::NewStuff
-    KF5::Parts
-    KF5::WindowSystem
+    Qt${QT_MAJOR_VERSION}::Concurrent
+    Qt${QT_MAJOR_VERSION}::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
+
+    KF6::MoreTools
 )
 
 if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC
-        KF5::FileMetaData
-        KF5::Baloo
-        KF5::BalooWidgets
+        KF6::FileMetaData
+        KF6::Baloo
+        KF6::BalooWidgets
     )
 endif()
 
 set_target_properties(dolphinprivate PROPERTIES
-    VERSION ${DOLPHINPRIVATE_VERSION_STRING}
+    VERSION ${DOLPHINPRIVATE_VERSION}
     SOVERSION ${DOLPHINPRIVATE_SOVERSION}
 )
 
@@ -175,30 +231,33 @@ install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMEL
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
 
 ##########################################
-configure_file(dolphinpart.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.desktop @ONLY)
+configure_file(dolphinpart.json.in ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.json @ONLY)
 
-set(dolphinpart_SRCS
-   dolphinpart.cpp
-   dolphinpart_ext.cpp
-   dolphindebug.cpp
-)
+add_library(dolphinpart MODULE)
 
-qt5_add_resources(dolphinpart_SRCS dolphinpart.qrc)
+target_sources(dolphinpart PRIVATE
+    dolphinpart.cpp
+    dolphinpart_ext.cpp
+    dolphindebug.cpp
+    dolphinpart.h
+    dolphinpart_ext.h
+    dolphindebug.h
 
-add_library(dolphinpart MODULE ${dolphinpart_SRCS})
-kcoreaddons_desktop_to_json(dolphinpart ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.desktop)
+    dolphinpart.qrc
+)
 
 target_link_libraries(dolphinpart
     dolphinprivate
 )
 
-install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts)
+install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dolphin/")
 
 ##########################################
 
-set(dolphinstatic_SRCS
+add_library(dolphinstatic STATIC)
+
+target_sources(dolphinstatic PRIVATE
     dolphinbookmarkhandler.cpp
     dolphindockwidget.cpp
     dolphinmainwindow.cpp
@@ -214,13 +273,8 @@ set(dolphinstatic_SRCS
     dolphinurlnavigatorscontroller.cpp
     trash/dolphintrash.cpp
     filterbar/filterbar.cpp
+    kitemviews/kfileitemlisttostring.cpp
     panels/places/placespanel.cpp
-    panels/places/placesitem.cpp
-    panels/places/placesitemlistgroupheader.cpp
-    panels/places/placesitemlistwidget.cpp
-    panels/places/placesitemmodel.cpp
-    panels/places/placesitemsignalhandler.cpp
-    panels/places/placesview.cpp
     panels/panel.cpp
     panels/folders/foldersitemlistwidget.cpp
     panels/folders/treeviewcontextmenu.cpp
@@ -229,8 +283,13 @@ set(dolphinstatic_SRCS
     search/dolphinfacetswidget.cpp
     search/dolphinquery.cpp
     search/dolphinsearchbox.cpp
+    selectionmode/actiontexthelper.cpp
+    selectionmode/actionwithwidget.cpp
+    selectionmode/backgroundcolorhelper.cpp
+    selectionmode/bottombar.cpp
+    selectionmode/bottombarcontentscontainer.cpp
+    selectionmode/topbar.cpp
     settings/general/behaviorsettingspage.cpp
-    settings/general/configurepreviewplugindialog.cpp
     settings/general/confirmationssettingspage.cpp
     settings/general/generalsettingspage.cpp
     settings/general/previewssettingspage.cpp
@@ -255,29 +314,93 @@ set(dolphinstatic_SRCS
     views/zoomlevelinfo.cpp
     dolphindebug.cpp
     global.cpp
+    dolphin.qrc
+
+    dolphinbookmarkhandler.h
+    dolphindockwidget.h
+    dolphinmainwindow.h
+    dolphinviewcontainer.h
+    dolphincontextmenu.h
+    dolphinnavigatorswidgetaction.h
+    dolphintabbar.h
+    dolphinplacesmodelsingleton.h
+    dolphinrecenttabsmenu.h
+    dolphintabpage.h
+    dolphintabwidget.h
+    dolphinurlnavigator.h
+    dolphinurlnavigatorscontroller.h
+    trash/dolphintrash.h
+    filterbar/filterbar.h
+    kitemviews/kfileitemlisttostring.h
+    panels/places/placespanel.h
+    panels/panel.h
+    panels/folders/foldersitemlistwidget.h
+    panels/folders/treeviewcontextmenu.h
+    panels/folders/folderspanel.h
+    panels/terminal/terminalpanel.h
+    search/dolphinfacetswidget.h
+    search/dolphinquery.h
+    search/dolphinsearchbox.h
+    selectionmode/actiontexthelper.h
+    selectionmode/actionwithwidget.h
+    selectionmode/backgroundcolorhelper.h
+    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/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
+    statusbar/dolphinstatusbar.h
+    statusbar/mountpointobserver.h
+    statusbar/mountpointobservercache.h
+    statusbar/spaceinfoobserver.h
+    statusbar/statusbarspaceinfo.h
+    views/zoomlevelinfo.h
+    dolphindebug.h
+    global.h
 )
 
 if(HAVE_BALOO)
-    set(dolphinstatic_SRCS
-        ${dolphinstatic_SRCS}
+    target_sources(dolphinstatic PRIVATE
         panels/information/informationpanel.cpp
         panels/information/informationpanelcontent.cpp
         panels/information/pixmapviewer.cpp
         panels/information/phononwidget.cpp
+        panels/information/informationpanel.h
+        panels/information/informationpanelcontent.h
+        panels/information/pixmapviewer.h
+        panels/information/phononwidget.h
     )
 endif()
 
 if(HAVE_KUSERFEEDBACK)
-    set(dolphinstatic_SRCS
-        ${dolphinstatic_SRCS}
+    target_sources(dolphinstatic PRIVATE
         userfeedback/dolphinfeedbackprovider.cpp
         userfeedback/settingsdatasource.cpp
         userfeedback/placesdatasource.cpp
         settings/userfeedback/userfeedbacksettingspage.cpp
+        userfeedback/dolphinfeedbackprovider.h
+        userfeedback/settingsdatasource.h
+        userfeedback/placesdatasource.h
+        settings/userfeedback/userfeedbacksettingspage.h
     )
 endif()
 
-kconfig_add_kcfg_files(dolphinstatic_SRCS
+kconfig_add_kcfg_files(dolphinstatic
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc
@@ -288,62 +411,75 @@ kconfig_add_kcfg_files(dolphinstatic_SRCS
     search/dolphin_searchsettings.kcfgc
     settings/dolphin_versioncontrolsettings.kcfgc
 )
-kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC
+kconfig_add_kcfg_files(dolphinstatic GENERATE_MOC
     settings/dolphin_generalsettings.kcfgc
 )
 
-qt5_add_resources(dolphinstatic_SRCS dolphin.qrc)
+qt_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dolphinmainwindow.h org.kde.DolphinMainWindow.xml)
+qt_add_dbus_adaptor(dolphin_dbus_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindow.h DolphinMainWindow)
+qt_add_dbus_interface(dolphin_dbus_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindowinterface)
+qt_add_dbus_interface(dolphin_dbus_SRCS panels/terminal/org.kde.KIOFuse.VFS.xml kiofuse_interface)
 
-qt5_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dolphinmainwindow.h org.kde.DolphinMainWindow.xml)
-qt5_add_dbus_adaptor(dolphinstatic_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindow.h DolphinMainWindow)
-qt5_add_dbus_interface(dolphinstatic_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindowinterface)
-qt5_add_dbus_interface(dolphinstatic_SRCS panels/terminal/org.kde.KIOFuse.VFS.xml kiofuse_interface)
-
-add_library(dolphinstatic STATIC ${dolphinstatic_SRCS})
+target_sources(dolphinstatic PRIVATE
+    ${dolphin_dbus_SRCS}
+)
 
 target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate
-    KF5::CoreAddons
-    KF5::KCMUtils
-    KF5::DBusAddons
-    KF5::Notifications
-    Phonon::phonon4qt5
+    KF6::CoreAddons
+    KF6::KCMUtils
+    KF6::DBusAddons
+    KF6::Notifications
+    Phonon::phonon4qt${QT_MAJOR_VERSION}
 )
 
 if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic
-        KF5::Activities
+        KF6::Activities
     )
 endif()
 
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic
-        KUserFeedbackCore
-        KUserFeedbackWidgets
+        KUserFeedbackCoreQt6
+        KUserFeedbackWidgetsQt6
     )
 endif()
 
-set(dolphin_SRCS
+add_executable(dolphin)
+
+target_sources(dolphin PRIVATE
     dbusinterface.cpp
+    dbusinterface.h
     main.cpp
 )
 
+if(FLATPAK)
+    target_compile_definitions(dolphin PRIVATE FLATPAK)
+endif()
+
 # Sets the icon on Windows and OSX
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
-ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
-
-add_executable(dolphin ${dolphin_SRCS})
+ecm_add_app_icon(dolphin ICONS ${ICONS_SRCS})
 
 target_link_libraries(dolphin
     PRIVATE
     dolphinprivate
     dolphinstatic
-    KF5::Crash
+    KF6::Crash
 )
 
+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()
+endif()
+
 include(DbusInterfaceMacros)
 
 generate_and_install_dbus_interface(
@@ -357,62 +493,74 @@ install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################
 
-set(kcm_dolphinviewmodes_PART_SRCS
-    settings/kcm/kcmdolphinviewmodes.cpp
-    settings/viewmodes/dolphinfontrequester.cpp
-    settings/viewmodes/viewmodesettings.cpp
-    settings/viewmodes/viewsettingstab.cpp
-    views/zoomlevelinfo.cpp)
-
-set(kcm_dolphinnavigation_PART_SRCS
-    settings/kcm/kcmdolphinnavigation.cpp
-    settings/navigation/navigationsettingspage.cpp
-    settings/settingspagebase.cpp)
-
-set(kcm_dolphingeneral_PART_SRCS
-    settings/kcm/kcmdolphingeneral.cpp
-    settings/general/behaviorsettingspage.cpp
-    settings/general/previewssettingspage.cpp
-    settings/general/configurepreviewplugindialog.cpp
-    settings/general/confirmationssettingspage.cpp
-    settings/settingspagebase.cpp
-    settings/serviceitemdelegate.cpp
-    settings/servicemodel.cpp)
-
-kconfig_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
-    settings/dolphin_compactmodesettings.kcfgc
-    settings/dolphin_directoryviewpropertysettings.kcfgc
-    settings/dolphin_detailsmodesettings.kcfgc
-    settings/dolphin_iconsmodesettings.kcfgc
-    settings/dolphin_generalsettings.kcfgc
-    settings/dolphin_versioncontrolsettings.kcfgc
-)
+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
+        settings/kcm/kcmdolphinviewmodes.cpp
+        settings/viewmodes/dolphinfontrequester.cpp
+        settings/viewmodes/viewmodesettings.cpp
+        settings/viewmodes/viewsettingstab.cpp
+        views/zoomlevelinfo.cpp
+        settings/kcm/kcmdolphinviewmodes.h
+        settings/viewmodes/dolphinfontrequester.h
+        settings/viewmodes/viewmodesettings.h
+        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
+    )
 
-kconfig_add_kcfg_files(kcm_dolphinnavigation_PART_SRCS
-    settings/dolphin_generalsettings.kcfgc)
+    target_sources(kcm_dolphingeneral PRIVATE
+        settings/kcm/kcmdolphingeneral.cpp
+        settings/general/behaviorsettingspage.cpp
+        settings/general/previewssettingspage.cpp
+        settings/general/confirmationssettingspage.cpp
+        settings/settingspagebase.cpp
+        settings/serviceitemdelegate.cpp
+        settings/servicemodel.cpp
+        settings/kcm/kcmdolphingeneral.h
+        settings/general/behaviorsettingspage.h
+        settings/general/previewssettingspage.h
+        settings/general/confirmationssettingspage.h
+        settings/settingspagebase.h
+        settings/serviceitemdelegate.h
+        settings/servicemodel.h
+    )
 
-kconfig_add_kcfg_files(kcm_dolphingeneral_PART_SRCS
-    settings/dolphin_generalsettings.kcfgc)
+    kconfig_add_kcfg_files(kcm_dolphinviewmodes
+        settings/dolphin_compactmodesettings.kcfgc
+        settings/dolphin_directoryviewpropertysettings.kcfgc
+        settings/dolphin_detailsmodesettings.kcfgc
+        settings/dolphin_iconsmodesettings.kcfgc
+        settings/dolphin_generalsettings.kcfgc
+        settings/dolphin_versioncontrolsettings.kcfgc
+    )
 
+    kconfig_add_kcfg_files(kcm_dolphinnavigation
+        settings/dolphin_generalsettings.kcfgc)
 
-if(NOT WIN32)
-    # The settings are still accessible from the hamburger menu
-    add_library(kcm_dolphinviewmodes MODULE ${kcm_dolphinviewmodes_PART_SRCS})
-    add_library(kcm_dolphinnavigation MODULE ${kcm_dolphinnavigation_PART_SRCS})
-    add_library(kcm_dolphingeneral MODULE ${kcm_dolphingeneral_PART_SRCS})
+    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( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-    install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-    install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
 
-    install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-    install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-    install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+    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()
 
 if(NOT WIN32)
@@ -439,7 +587,9 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
 
+install( FILES settings/dolphin_detailsmodesettings.upd
+         DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} )
+
 if(BUILD_TESTING)
-    find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
     add_subdirectory(tests)
 endif()