diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3ada71b11..9157fe910a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,11 +215,11 @@ if(WAYLAND_FOUND AND KWIN_HAVE_EGL)
     set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} egl_wayland_backend.cpp)
 endif()
 
-kde4_add_kcfg_files(kwin_KDEINIT_SRCS settings.kcfgc)
+kconfig_add_kcfg_files(kwin_KDEINIT_SRCS settings.kcfgc)
 
-qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface )
-qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor )
-qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl )
+qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface )
+qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor )
+qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl )
 
 qt5_add_dbus_interface( kwin_KDEINIT_SRCS
   ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface)
diff --git a/effects/blur/CMakeLists.txt b/effects/blur/CMakeLists.txt
index c0ddcf0741..c99f7ee091 100644
--- a/effects/blur/CMakeLists.txt
+++ b/effects/blur/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
      blur/blur.cpp
      blur/blurshader.cpp )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources blur/blurconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources blur/blurconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -21,7 +21,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
      blur/blur_config.cpp
      blur/blur_config.ui )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources blur/blurconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources blur/blurconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/coverswitch/CMakeLists.txt b/effects/coverswitch/CMakeLists.txt
index 15606d99db..79492287f5 100644
--- a/effects/coverswitch/CMakeLists.txt
+++ b/effects/coverswitch/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     coverswitch/coverswitch.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources coverswitch/coverswitchconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources coverswitch/coverswitchconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -29,7 +29,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     coverswitch/coverswitch_config.cpp
     coverswitch/coverswitch_config.ui
     )
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources coverswitch/coverswitchconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources coverswitch/coverswitchconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt
index 492fd671e4..067ff4a073 100644
--- a/effects/cube/CMakeLists.txt
+++ b/effects/cube/CMakeLists.txt
@@ -8,7 +8,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     cube/cubeslide.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources
     cube/cubeslideconfig.kcfgc
     cube/cubeconfig.kcfgc
     )
@@ -51,7 +51,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     cube/cubeslide_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources
     cube/cubeslideconfig.kcfgc
     cube/cubeconfig.kcfgc
     )
diff --git a/effects/dashboard/CMakeLists.txt b/effects/dashboard/CMakeLists.txt
index 54e8c47ea4..19153bafc7 100644
--- a/effects/dashboard/CMakeLists.txt
+++ b/effects/dashboard/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
      dashboard/dashboard.cpp
      dashboard/dashboard.cpp )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources dashboard/dashboardconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources dashboard/dashboardconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -21,7 +21,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
      dashboard/dashboard_config.cpp
      dashboard/dashboard_config.ui )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources dashboard/dashboardconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources dashboard/dashboardconfig.kcfgc)
 
 install( FILES
          dashboard/dashboard_config.desktop
diff --git a/effects/desktopgrid/CMakeLists.txt b/effects/desktopgrid/CMakeLists.txt
index ecd106be2f..a7acf4a3ab 100644
--- a/effects/desktopgrid/CMakeLists.txt
+++ b/effects/desktopgrid/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     desktopgrid/desktopgrid.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources desktopgrid/desktopgridconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources desktopgrid/desktopgridconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -26,7 +26,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     desktopgrid/desktopgrid_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources desktopgrid/desktopgridconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources desktopgrid/desktopgridconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/diminactive/CMakeLists.txt b/effects/diminactive/CMakeLists.txt
index 1ce7bcaa4f..224d4dbb77 100644
--- a/effects/diminactive/CMakeLists.txt
+++ b/effects/diminactive/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     diminactive/diminactive.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources diminactive/diminactiveconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources diminactive/diminactiveconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     diminactive/diminactive_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources diminactive/diminactiveconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources diminactive/diminactiveconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/flipswitch/CMakeLists.txt b/effects/flipswitch/CMakeLists.txt
index ec90ca5ad0..c28b53a919 100644
--- a/effects/flipswitch/CMakeLists.txt
+++ b/effects/flipswitch/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     flipswitch/flipswitch.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources flipswitch/flipswitchconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources flipswitch/flipswitchconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     flipswitch/flipswitch_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources flipswitch/flipswitchconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources flipswitch/flipswitchconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/glide/CMakeLists.txt b/effects/glide/CMakeLists.txt
index ff893dce78..31798ec7bb 100644
--- a/effects/glide/CMakeLists.txt
+++ b/effects/glide/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     glide/glide.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources glide/glideconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources glide/glideconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -21,7 +21,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
      glide/glide_config.cpp
      glide/glide_config.ui )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources glide/glideconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources glide/glideconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/kscreen/CMakeLists.txt b/effects/kscreen/CMakeLists.txt
index 9f2aec0a02..143861df74 100644
--- a/effects/kscreen/CMakeLists.txt
+++ b/effects/kscreen/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
      kscreen/kscreen.cpp
 )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources kscreen/kscreenconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources kscreen/kscreenconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/logout/CMakeLists.txt b/effects/logout/CMakeLists.txt
index aa37fd7b1d..b6c20f8c6a 100644
--- a/effects/logout/CMakeLists.txt
+++ b/effects/logout/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     logout/logout.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources logout/logoutconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources logout/logoutconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/lookingglass/CMakeLists.txt b/effects/lookingglass/CMakeLists.txt
index 26d72ddef4..956e2f01da 100644
--- a/effects/lookingglass/CMakeLists.txt
+++ b/effects/lookingglass/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     lookingglass/lookingglass.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources lookingglass/lookingglassconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources lookingglass/lookingglassconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -30,7 +30,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     lookingglass/lookingglass_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources lookingglass/lookingglassconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources lookingglass/lookingglassconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/magiclamp/CMakeLists.txt b/effects/magiclamp/CMakeLists.txt
index fafd07c1e5..7de61ba432 100644
--- a/effects/magiclamp/CMakeLists.txt
+++ b/effects/magiclamp/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     magiclamp/magiclamp.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources magiclamp/magiclampconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources magiclamp/magiclampconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     magiclamp/magiclamp_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources magiclamp/magiclampconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources magiclamp/magiclampconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/magnifier/CMakeLists.txt b/effects/magnifier/CMakeLists.txt
index 79a308fbae..bf4c056e28 100644
--- a/effects/magnifier/CMakeLists.txt
+++ b/effects/magnifier/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     magnifier/magnifier.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources magnifier/magnifierconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources magnifier/magnifierconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -21,7 +21,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     magnifier/magnifier_config.cpp
     magnifier/magnifier_config.ui
     )
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources magnifier/magnifierconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources magnifier/magnifierconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/mouseclick/CMakeLists.txt b/effects/mouseclick/CMakeLists.txt
index 2c59bc6e1a..76f3bc8f71 100644
--- a/effects/mouseclick/CMakeLists.txt
+++ b/effects/mouseclick/CMakeLists.txt
@@ -6,7 +6,7 @@
 set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     mouseclick/mouseclick.cpp
     )
-kde4_add_kcfg_files(kwin4_effect_builtins_sources mouseclick/mouseclickconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources mouseclick/mouseclickconfig.kcfgc)
 
 # .desktop files
 install( FILES 
@@ -23,7 +23,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     mouseclick/mouseclick_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources mouseclick/mouseclickconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources mouseclick/mouseclickconfig.kcfgc)
 
 install( FILES 
          mouseclick/mouseclick_config.desktop
diff --git a/effects/mousemark/CMakeLists.txt b/effects/mousemark/CMakeLists.txt
index 5e6f3683d9..4bd7b713a3 100644
--- a/effects/mousemark/CMakeLists.txt
+++ b/effects/mousemark/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     mousemark/mousemark.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources mousemark/mousemarkconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources mousemark/mousemarkconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     mousemark/mousemark_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources mousemark/mousemarkconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources mousemark/mousemarkconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/presentwindows/CMakeLists.txt b/effects/presentwindows/CMakeLists.txt
index 94f6236bea..d4484dbf0d 100644
--- a/effects/presentwindows/CMakeLists.txt
+++ b/effects/presentwindows/CMakeLists.txt
@@ -7,7 +7,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     presentwindows/presentwindows_proxy.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources presentwindows/presentwindowsconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources presentwindows/presentwindowsconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -27,7 +27,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     presentwindows/presentwindows_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources presentwindows/presentwindowsconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources presentwindows/presentwindowsconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/resize/CMakeLists.txt b/effects/resize/CMakeLists.txt
index 19af1b1149..83c4d66dc6 100644
--- a/effects/resize/CMakeLists.txt
+++ b/effects/resize/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     resize/resize.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources resize/resizeconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources resize/resizeconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -21,7 +21,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     resize/resize_config.cpp
     resize/resize_config.ui
     )
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources resize/resizeconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources resize/resizeconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/sheet/CMakeLists.txt b/effects/sheet/CMakeLists.txt
index a0008b10c1..1033d4077a 100644
--- a/effects/sheet/CMakeLists.txt
+++ b/effects/sheet/CMakeLists.txt
@@ -5,7 +5,7 @@
 set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     sheet/sheet.cpp
     )
-kde4_add_kcfg_files(kwin4_effect_builtins_sources sheet/sheetconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources sheet/sheetconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/showfps/CMakeLists.txt b/effects/showfps/CMakeLists.txt
index 7e9f67cf8a..0acfd9653b 100644
--- a/effects/showfps/CMakeLists.txt
+++ b/effects/showfps/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     showfps/showfps.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources showfps/showfpsconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources showfps/showfpsconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     showfps/showfps_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources showfps/showfpsconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources showfps/showfpsconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/thumbnailaside/CMakeLists.txt b/effects/thumbnailaside/CMakeLists.txt
index 7ee2dce227..fd0f30d293 100644
--- a/effects/thumbnailaside/CMakeLists.txt
+++ b/effects/thumbnailaside/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     thumbnailaside/thumbnailaside.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources thumbnailaside/thumbnailasideconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources thumbnailaside/thumbnailasideconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     thumbnailaside/thumbnailaside_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources thumbnailaside/thumbnailasideconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources thumbnailaside/thumbnailasideconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/trackmouse/CMakeLists.txt b/effects/trackmouse/CMakeLists.txt
index 937c24d58b..0292c8d8b1 100644
--- a/effects/trackmouse/CMakeLists.txt
+++ b/effects/trackmouse/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     trackmouse/trackmouse.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources trackmouse/trackmouseconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources trackmouse/trackmouseconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -28,7 +28,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     trackmouse/trackmouse_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources trackmouse/trackmouseconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources trackmouse/trackmouseconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/windowgeometry/CMakeLists.txt b/effects/windowgeometry/CMakeLists.txt
index 1f25a99b45..97b05adc54 100644
--- a/effects/windowgeometry/CMakeLists.txt
+++ b/effects/windowgeometry/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     windowgeometry/windowgeometry.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources windowgeometry/windowgeometryconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources windowgeometry/windowgeometryconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     windowgeometry/windowgeometry_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources windowgeometry/windowgeometryconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources windowgeometry/windowgeometryconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/wobblywindows/CMakeLists.txt b/effects/wobblywindows/CMakeLists.txt
index a736bdab04..ef6c010302 100644
--- a/effects/wobblywindows/CMakeLists.txt
+++ b/effects/wobblywindows/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     wobblywindows/wobblywindows.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources wobblywindows/wobblywindowsconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources wobblywindows/wobblywindowsconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -22,7 +22,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     wobblywindows/wobblywindows_config.ui
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources wobblywindows/wobblywindowsconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources wobblywindows/wobblywindowsconfig.kcfgc)
 
 # .desktop files
 install( FILES
diff --git a/effects/zoom/CMakeLists.txt b/effects/zoom/CMakeLists.txt
index ca2449e2a6..7db2b7b602 100644
--- a/effects/zoom/CMakeLists.txt
+++ b/effects/zoom/CMakeLists.txt
@@ -6,7 +6,7 @@ set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
     zoom/zoom.cpp
     )
 
-kde4_add_kcfg_files(kwin4_effect_builtins_sources zoom/zoomconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_sources zoom/zoomconfig.kcfgc)
 
 # .desktop files
 install( FILES
@@ -21,7 +21,7 @@ set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources
     zoom/zoom_config.cpp
     zoom/zoom_config.ui
     )
-kde4_add_kcfg_files(kwin4_effect_builtins_config_sources zoom/zoomconfig.kcfgc)
+kconfig_add_kcfg_files(kwin4_effect_builtins_config_sources zoom/zoomconfig.kcfgc)
 
 # .desktop files
 install( FILES