Port to kcmutils_add_qml_module

kcms/cellularnetwork/CMakeLists.txt

@@ -1,7 +1,9 @@
 # SPDX-FileCopyrightText: 2021 Devin Lin <devin@kde.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set (cellularnetworksettings_SRCS 
+kcmutils_add_qml_kcm(kcm_cellular_network)
+
+target_sources(kcm_cellular_network PRIVATE
     cellularnetworksettings.cpp 
     modem.cpp
     modemdetails.cpp
@@ -9,9 +11,6 @@ set (cellularnetworksettings_SRCS
     mobileproviders.cpp
     profilesettings.cpp
 )
-
-kcoreaddons_add_plugin(kcm_cellular_network SOURCES ${cellularnetworksettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
-
 target_link_libraries(kcm_cellular_network
     Qt::DBus
     Qt::Gui
@@ -24,6 +23,3 @@ target_link_libraries(kcm_cellular_network
     KF6::ModemManagerQt
     KF6::KCMUtilsQuick
 )
-
-kcmutils_generate_desktop_file(kcm_cellular_network)
-kpackage_install_package(package kcm_cellular_network kcms)

kcms/hotspot/CMakeLists.txt

@@ -1,10 +1,7 @@
 # SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 # SPDX-License-Identifier: LGPL-2.0-or-later
 
-set (hotspotsettings_SRCS hotspotsettings.cpp)
+kcmutils_add_qml_kcm(kcm_mobile_hotspot SOURCES hotspotsettings.cpp)
-
-kcoreaddons_add_plugin(kcm_mobile_hotspot SOURCES ${hotspotsettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
-
 target_link_libraries(kcm_mobile_hotspot
     Qt::Quick
     Qt::Qml
@@ -13,5 +10,3 @@ target_link_libraries(kcm_mobile_hotspot
     KF6::KCMUtilsQuick
 )
 
-kpackage_install_package(package kcm_mobile_hotspot kcms)
-kcmutils_generate_desktop_file(kcm_mobile_hotspot)

kcms/info/CMakeLists.txt

@@ -1,15 +1,14 @@
 # SPDX-FileCopyrightText: 2019 Jonah Brüchert <jbb@kaidan.im>
 # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-set(info_SRCS # Specify source files for the library
+kcmutils_add_qml_kcm(kcm_mobile_info)
+
+target_sources(kcm_mobile_info PRIVATE 
     info.cpp
     distroinfo.cpp
     softwareinfo.cpp
     hardwareinfo.cpp
 )
-
-kcoreaddons_add_plugin(kcm_mobile_info SOURCES ${info_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
-
 target_link_libraries(kcm_mobile_info
     Qt::Core
     Qt::Gui
@@ -20,6 +19,3 @@ target_link_libraries(kcm_mobile_info
     KF6::Solid
 )
 
-kpackage_install_package(package kcm_mobile_info kcms)
-kcmutils_generate_desktop_file(kcm_mobile_info)
-

kcms/mobileshell/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-kcoreaddons_add_plugin(kcm_mobileshell SOURCES kcm.cpp INSTALL_NAMESPACE "plasma/kcms/systemsettings")
+kcmutils_add_qml_kcm(kcm_mobileshell SOURCES kcm.cpp)
 
 target_link_libraries(kcm_mobileshell
     Qt::Core
@@ -11,6 +11,3 @@ target_link_libraries(kcm_mobileshell
     KF6::KCMUtilsQuick
 )
 
-kcmutils_generate_desktop_file(kcm_mobileshell)
-
-kpackage_install_package(package kcm_mobileshell kcms) # Install our QML kpackage.

kcms/powermanagement/CMakeLists.txt

@@ -3,14 +3,13 @@
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kcm_mobile_power\")
 
-set(kcm_mobile_power_SRCS
+kcmutils_add_qml_kcm(kcm_mobile_power SOURCES ${kcm_mobile_power_SRCS})
+
+target_sources(kcm_mobile_power PRIVATE
     mobilepower.cpp
     batterymodel.cpp
     statisticsprovider.cpp
 )
-
-kcoreaddons_add_plugin(kcm_mobile_power SOURCES ${kcm_mobile_power_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
-
 target_link_libraries(kcm_mobile_power
     Qt::DBus
     Qt::Core
@@ -21,5 +20,3 @@ target_link_libraries(kcm_mobile_power
     KF6::Solid
 )
 
-kcmutils_generate_desktop_file(kcm_mobile_power)
-kpackage_install_package(package kcm_mobile_power kcms)

kcms/time/CMakeLists.txt

@@ -10,7 +10,7 @@ set(timesettings_SRCS
 
 qt_add_dbus_interface(timesettings_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/timedated1.xml timedated_interface)
 
-kcoreaddons_add_plugin(kcm_mobile_time SOURCES ${timesettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
+kcmutils_add_qml_kcm(kcm_mobile_time SOURCES ${timesettings_SRCS})
 
 target_link_libraries(kcm_mobile_time
     Qt::Quick
@@ -21,7 +21,3 @@ target_link_libraries(kcm_mobile_time
     KF6::I18n
 )
 
-# Time and Date
-
-kcmutils_generate_desktop_file(kcm_mobile_time)
-kpackage_install_package(package kcm_mobile_time kcms)

kcms/virtualkeyboard/CMakeLists.txt

@@ -5,14 +5,13 @@ set(MALIIT_KEYBOARD_LANGUAGES_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/maliit/keyboard2
 
 add_definitions(-DQT_NO_KEYWORDS)
 
-set(onscreenkeyboard_SRCS
+kcmutils_add_qml_kcm(kcm_mobile_onscreenkeyboard)
+
+target_sources(kcm_mobile_onscreenkeyboard PRIVATE
     languagemodel.cpp
     gsettingsitem.cpp
     virtualkeyboard.cpp
 )
-
-kcoreaddons_add_plugin(kcm_mobile_onscreenkeyboard SOURCES ${onscreenkeyboard_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
-
 target_compile_definitions(kcm_mobile_onscreenkeyboard PRIVATE "MALIIT_KEYBOARD_LANGUAGES_DIR=\"${MALIIT_KEYBOARD_LANGUAGES_DIR}\"")
 
 target_link_libraries(kcm_mobile_onscreenkeyboard
@@ -24,6 +23,3 @@ target_link_libraries(kcm_mobile_onscreenkeyboard
     PkgConfig::GIO
     PkgConfig::GOBJECT
 )
-
-kcmutils_generate_desktop_file(kcm_mobile_onscreenkeyboard)
-kpackage_install_package(package kcm_mobile_onscreenkeyboard kcms)

kcms/wifi/CMakeLists.txt

@@ -1,12 +1,7 @@
 # SPDX-FileCopyrightText: 2018 Martin Kacej <m.kacej@atlas.sk>
 # SPDX-License-Identifier: LGPL-2.0-or-later
 
-project (kcm_mobile_wifi)
+kcmutils_add_qml_kcm(kcm_mobile_wifi SOURCES wifisettings.cpp)
-
-set (wifisettings_SRCS wifisettings.cpp)
-
-kcoreaddons_add_plugin(kcm_mobile_wifi SOURCES ${wifisettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
-
 target_link_libraries(kcm_mobile_wifi
     Qt::DBus
     Qt::Gui
@@ -18,5 +13,3 @@ target_link_libraries(kcm_mobile_wifi
     KF6::KCMUtilsQuick
 )
 
-kpackage_install_package(package kcm_mobile_wifi kcms)
-kcmutils_generate_desktop_file(kcm_mobile_wifi)