Adjust to changes in KToolBarPopupAction

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fedf96688f77845c7532c0f122a5db6fe868320d..5a481e39ff4b4e89ff3f87ebb3f1c4f74bffd0b6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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})
 
@@ -183,6 +184,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
@@ -298,7 +300,6 @@ target_sources(dolphinstatic PRIVATE
     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
@@ -306,6 +307,7 @@ target_sources(dolphinstatic PRIVATE
     settings/viewmodes/viewsettingspage.cpp
     settings/viewmodes/viewmodesettings.cpp
     settings/viewmodes/viewsettingstab.cpp
+    settings/viewmodes/contentdisplaytab.cpp
     statusbar/dolphinstatusbar.cpp
     statusbar/mountpointobserver.cpp
     statusbar/mountpointobservercache.cpp
@@ -356,7 +358,6 @@ target_sources(dolphinstatic PRIVATE
     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
@@ -364,6 +365,7 @@ target_sources(dolphinstatic PRIVATE
     settings/viewmodes/viewsettingspage.h
     settings/viewmodes/viewmodesettings.h
     settings/viewmodes/viewsettingstab.h
+    settings/viewmodes/contentdisplaytab.h
     statusbar/dolphinstatusbar.h
     statusbar/mountpointobserver.h
     statusbar/mountpointobservercache.h
@@ -408,6 +410,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
 )
@@ -526,14 +529,12 @@ if(NOT WIN32)
         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
     )
 
@@ -542,6 +543,7 @@ 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
     )
@@ -584,6 +586,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} )