CMakeLists.txt: make sure settings.kcfg are shared

Between all dolphinprivate library users.
So that the KConfigSkeleton singleton have unique instances accross
libraries bounds.

To fully fix the bug, make sure to save the modified file to disk.

BUG: 368121

10 files changed, 19 insertions, 27 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e982fce8..80f2f12b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -460,16 +460,7 @@ endif()
 kconfig_add_kcfg_files(dolphinstatic
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc
-    settings/dolphin_compactmodesettings.kcfgc
-    settings/dolphin_detailsmodesettings.kcfgc
-    settings/dolphin_contextmenusettings.kcfgc
-    settings/dolphin_iconsmodesettings.kcfgc
-    settings/dolphin_contentdisplaysettings.kcfgc
     search/dolphin_searchsettings.kcfgc
-    settings/dolphin_versioncontrolsettings.kcfgc
-)
-kconfig_add_kcfg_files(dolphinstatic GENERATE_MOC
-    settings/dolphin_generalsettings.kcfgc
 )
 
 qt_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dolphinmainwindow.h org.kde.DolphinMainWindow.xml)
@@ -603,22 +594,6 @@ if(NOT WIN32)
         global.h
     )
 
-    kconfig_add_kcfg_files(kcm_dolphinviewmodes
-        settings/dolphin_compactmodesettings.kcfgc
-        settings/dolphin_directoryviewpropertysettings.kcfgc
-        settings/dolphin_detailsmodesettings.kcfgc
-        settings/dolphin_iconsmodesettings.kcfgc
-        settings/dolphin_contentdisplaysettings.kcfgc
-        settings/dolphin_generalsettings.kcfgc
-        settings/dolphin_versioncontrolsettings.kcfgc
-        GENERATE_MOC
-    )
-
-    kconfig_add_kcfg_files(kcm_dolphingeneral
-        settings/dolphin_generalsettings.kcfgc
-        GENERATE_MOC
-    )
-
     target_link_libraries(kcm_dolphinviewmodes dolphinprivate)
     target_link_libraries(kcm_dolphingeneral dolphinprivate)
 
@@ -649,7 +624,6 @@ 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} )
 
diff --git a/src/settings/dolphin_compactmodesettings.kcfgc b/src/settings/dolphin_compactmodesettings.kcfgc
index 8341185fa..f2e91b597 100644
--- a/src/settings/dolphin_compactmodesettings.kcfgc
+++ b/src/settings/dolphin_compactmodesettings.kcfgc
@@ -2,3 +2,5 @@ File=dolphin_compactmodesettings.kcfg
 ClassName=CompactModeSettings
 Singleton=yes
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/dolphin_contentdisplaysettings.kcfgc b/src/settings/dolphin_contentdisplaysettings.kcfgc
index c986578b2..ba7077c45 100644
--- a/src/settings/dolphin_contentdisplaysettings.kcfgc
+++ b/src/settings/dolphin_contentdisplaysettings.kcfgc
@@ -2,3 +2,5 @@ File=dolphin_contentdisplaysettings.kcfg
 ClassName=ContentDisplaySettings
 Singleton=yes
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/dolphin_contextmenusettings.kcfgc b/src/settings/dolphin_contextmenusettings.kcfgc
index b50e98f01..556061b12 100644
--- a/src/settings/dolphin_contextmenusettings.kcfgc
+++ b/src/settings/dolphin_contextmenusettings.kcfgc
@@ -2,3 +2,5 @@ File=dolphin_contextmenusettings.kcfg
 ClassName=ContextMenuSettings
 Singleton=yes
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/dolphin_detailsmodesettings.kcfgc b/src/settings/dolphin_detailsmodesettings.kcfgc
index 7acfa3c7d..2e91dff87 100644
--- a/src/settings/dolphin_detailsmodesettings.kcfgc
+++ b/src/settings/dolphin_detailsmodesettings.kcfgc
@@ -2,3 +2,5 @@ File=dolphin_detailsmodesettings.kcfg
 ClassName=DetailsModeSettings
 Singleton=yes
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfgc b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
index b938ab3e4..d04750a83 100644
--- a/src/settings/dolphin_directoryviewpropertysettings.kcfgc
+++ b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
@@ -3,4 +3,5 @@ Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true
 GlobalEnums=true
-IncludeFiles=views/dolphinview.h,qnamespace.h
+IncludeFiles=views/dolphinview.h,qnamespace.h,dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/dolphin_generalsettings.kcfgc b/src/settings/dolphin_generalsettings.kcfgc
index 7090dbce4..d193b948c 100644
--- a/src/settings/dolphin_generalsettings.kcfgc
+++ b/src/settings/dolphin_generalsettings.kcfgc
@@ -2,3 +2,6 @@ File=dolphin_generalsettings.kcfg
 ClassName=GeneralSettings
 Singleton=yes
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
+
diff --git a/src/settings/dolphin_iconsmodesettings.kcfgc b/src/settings/dolphin_iconsmodesettings.kcfgc
index 9ab145bc2..5dbd3371f 100644
--- a/src/settings/dolphin_iconsmodesettings.kcfgc
+++ b/src/settings/dolphin_iconsmodesettings.kcfgc
@@ -2,3 +2,5 @@ File=dolphin_iconsmodesettings.kcfg
 ClassName=IconsModeSettings
 Singleton=yes
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/dolphin_versioncontrolsettings.kcfgc b/src/settings/dolphin_versioncontrolsettings.kcfgc
index 232268fe3..f053fc646 100644
--- a/src/settings/dolphin_versioncontrolsettings.kcfgc
+++ b/src/settings/dolphin_versioncontrolsettings.kcfgc
@@ -2,3 +2,5 @@ File=dolphin_versioncontrolsettings.kcfg
 ClassName=VersionControlSettings
 Singleton=true
 Mutators=true
+IncludeFiles=dolphin_export.h
+Visibility=DOLPHIN_EXPORT
diff --git a/src/settings/viewmodes/contentdisplaytab.cpp b/src/settings/viewmodes/contentdisplaytab.cpp
index 9e5d1802b..4c30f99eb 100644
--- a/src/settings/viewmodes/contentdisplaytab.cpp
+++ b/src/settings/viewmodes/contentdisplaytab.cpp
@@ -166,6 +166,8 @@ void ContentDisplayTab::applySettings()
         settings->setElidingMode(ContentDisplaySettings::ElidingMode::Right);
     }
     settings->save();
+
+    GeneralSettings::self()->save();
 }
 
 void ContentDisplayTab::loadSettings()