From 739897e33510d4df9ba9c00a6bc7749bfe7a9af9 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sat, 6 May 2023 12:10:16 +0200 Subject: [PATCH] Port to kcmutils_add_qml_module --- kcms/cellularnetwork/CMakeLists.txt | 10 +++------- .../{package/contents => }/ui/AvailableNetworks.qml | 0 .../{package/contents => }/ui/EditProfileDialog.qml | 0 .../{package/contents => }/ui/MessagesList.qml | 0 .../{package/contents => }/ui/ModemPage.qml | 0 .../{package/contents => }/ui/PopupDialog.qml | 0 .../{package/contents => }/ui/ProfileList.qml | 0 .../{package/contents => }/ui/SimLockPage.qml | 0 .../{package/contents => }/ui/SimPage.qml | 0 .../cellularnetwork/{package/contents => }/ui/main.qml | 0 kcms/hotspot/CMakeLists.txt | 7 +------ kcms/hotspot/{package/contents => }/ui/main.qml | 0 kcms/info/CMakeLists.txt | 10 +++------- kcms/info/{package/contents => }/ui/main.qml | 0 kcms/mobileshell/CMakeLists.txt | 5 +---- .../{package/contents => }/ui/QuickSettingsForm.qml | 0 .../{package/contents => }/ui/VibrationForm.qml | 0 kcms/mobileshell/{package/contents => }/ui/main.qml | 0 kcms/powermanagement/CMakeLists.txt | 9 +++------ .../{package/contents => }/ui/BatteryPage.qml | 0 .../{package/contents => }/ui/Graph.qml | 0 .../powermanagement/{package/contents => }/ui/main.qml | 0 kcms/time/CMakeLists.txt | 6 +----- kcms/time/{package/contents => }/ui/DatePicker.qml | 0 kcms/time/{package/contents => }/ui/Digit.qml | 0 kcms/time/{package/contents => }/ui/TimePicker.qml | 0 kcms/time/{package/contents => }/ui/main.qml | 0 kcms/virtualkeyboard/CMakeLists.txt | 10 +++------- .../{package/contents => }/ui/languages.qml | 0 .../virtualkeyboard/{package/contents => }/ui/main.qml | 0 kcms/wifi/CMakeLists.txt | 9 +-------- kcms/wifi/{package/contents => }/ui/ConnectDialog.qml | 0 .../contents => }/ui/ConnectionItemDelegate.qml | 0 .../wifi/{package/contents => }/ui/NetworkSettings.qml | 0 kcms/wifi/{package/contents => }/ui/PasswordField.qml | 0 kcms/wifi/{package/contents => }/ui/main.qml | 0 36 files changed, 16 insertions(+), 50 deletions(-) rename kcms/cellularnetwork/{package/contents => }/ui/AvailableNetworks.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/EditProfileDialog.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/MessagesList.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/ModemPage.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/PopupDialog.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/ProfileList.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/SimLockPage.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/SimPage.qml (100%) rename kcms/cellularnetwork/{package/contents => }/ui/main.qml (100%) rename kcms/hotspot/{package/contents => }/ui/main.qml (100%) rename kcms/info/{package/contents => }/ui/main.qml (100%) rename kcms/mobileshell/{package/contents => }/ui/QuickSettingsForm.qml (100%) rename kcms/mobileshell/{package/contents => }/ui/VibrationForm.qml (100%) rename kcms/mobileshell/{package/contents => }/ui/main.qml (100%) rename kcms/powermanagement/{package/contents => }/ui/BatteryPage.qml (100%) rename kcms/powermanagement/{package/contents => }/ui/Graph.qml (100%) rename kcms/powermanagement/{package/contents => }/ui/main.qml (100%) rename kcms/time/{package/contents => }/ui/DatePicker.qml (100%) rename kcms/time/{package/contents => }/ui/Digit.qml (100%) rename kcms/time/{package/contents => }/ui/TimePicker.qml (100%) rename kcms/time/{package/contents => }/ui/main.qml (100%) rename kcms/virtualkeyboard/{package/contents => }/ui/languages.qml (100%) rename kcms/virtualkeyboard/{package/contents => }/ui/main.qml (100%) rename kcms/wifi/{package/contents => }/ui/ConnectDialog.qml (100%) rename kcms/wifi/{package/contents => }/ui/ConnectionItemDelegate.qml (100%) rename kcms/wifi/{package/contents => }/ui/NetworkSettings.qml (100%) rename kcms/wifi/{package/contents => }/ui/PasswordField.qml (100%) rename kcms/wifi/{package/contents => }/ui/main.qml (100%) diff --git a/kcms/cellularnetwork/CMakeLists.txt b/kcms/cellularnetwork/CMakeLists.txt index 5bdf3aaa..d51b69b1 100644 --- a/kcms/cellularnetwork/CMakeLists.txt +++ b/kcms/cellularnetwork/CMakeLists.txt @@ -1,7 +1,9 @@ # SPDX-FileCopyrightText: 2021 Devin Lin # 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) diff --git a/kcms/cellularnetwork/package/contents/ui/AvailableNetworks.qml b/kcms/cellularnetwork/ui/AvailableNetworks.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/AvailableNetworks.qml rename to kcms/cellularnetwork/ui/AvailableNetworks.qml diff --git a/kcms/cellularnetwork/package/contents/ui/EditProfileDialog.qml b/kcms/cellularnetwork/ui/EditProfileDialog.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/EditProfileDialog.qml rename to kcms/cellularnetwork/ui/EditProfileDialog.qml diff --git a/kcms/cellularnetwork/package/contents/ui/MessagesList.qml b/kcms/cellularnetwork/ui/MessagesList.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/MessagesList.qml rename to kcms/cellularnetwork/ui/MessagesList.qml diff --git a/kcms/cellularnetwork/package/contents/ui/ModemPage.qml b/kcms/cellularnetwork/ui/ModemPage.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/ModemPage.qml rename to kcms/cellularnetwork/ui/ModemPage.qml diff --git a/kcms/cellularnetwork/package/contents/ui/PopupDialog.qml b/kcms/cellularnetwork/ui/PopupDialog.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/PopupDialog.qml rename to kcms/cellularnetwork/ui/PopupDialog.qml diff --git a/kcms/cellularnetwork/package/contents/ui/ProfileList.qml b/kcms/cellularnetwork/ui/ProfileList.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/ProfileList.qml rename to kcms/cellularnetwork/ui/ProfileList.qml diff --git a/kcms/cellularnetwork/package/contents/ui/SimLockPage.qml b/kcms/cellularnetwork/ui/SimLockPage.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/SimLockPage.qml rename to kcms/cellularnetwork/ui/SimLockPage.qml diff --git a/kcms/cellularnetwork/package/contents/ui/SimPage.qml b/kcms/cellularnetwork/ui/SimPage.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/SimPage.qml rename to kcms/cellularnetwork/ui/SimPage.qml diff --git a/kcms/cellularnetwork/package/contents/ui/main.qml b/kcms/cellularnetwork/ui/main.qml similarity index 100% rename from kcms/cellularnetwork/package/contents/ui/main.qml rename to kcms/cellularnetwork/ui/main.qml diff --git a/kcms/hotspot/CMakeLists.txt b/kcms/hotspot/CMakeLists.txt index 0bf6d2f2..614b5237 100644 --- a/kcms/hotspot/CMakeLists.txt +++ b/kcms/hotspot/CMakeLists.txt @@ -1,10 +1,7 @@ # SPDX-FileCopyrightText: 2020 Tobias Fella # SPDX-License-Identifier: LGPL-2.0-or-later -set (hotspotsettings_SRCS hotspotsettings.cpp) - -kcoreaddons_add_plugin(kcm_mobile_hotspot SOURCES ${hotspotsettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings") - +kcmutils_add_qml_kcm(kcm_mobile_hotspot SOURCES hotspotsettings.cpp) 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) diff --git a/kcms/hotspot/package/contents/ui/main.qml b/kcms/hotspot/ui/main.qml similarity index 100% rename from kcms/hotspot/package/contents/ui/main.qml rename to kcms/hotspot/ui/main.qml diff --git a/kcms/info/CMakeLists.txt b/kcms/info/CMakeLists.txt index dcdd64c8..1337aba0 100644 --- a/kcms/info/CMakeLists.txt +++ b/kcms/info/CMakeLists.txt @@ -1,15 +1,14 @@ # SPDX-FileCopyrightText: 2019 Jonah Brüchert # 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) - diff --git a/kcms/info/package/contents/ui/main.qml b/kcms/info/ui/main.qml similarity index 100% rename from kcms/info/package/contents/ui/main.qml rename to kcms/info/ui/main.qml diff --git a/kcms/mobileshell/CMakeLists.txt b/kcms/mobileshell/CMakeLists.txt index b9c37d31..d161baba 100644 --- a/kcms/mobileshell/CMakeLists.txt +++ b/kcms/mobileshell/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2022 Devin Lin # 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. diff --git a/kcms/mobileshell/package/contents/ui/QuickSettingsForm.qml b/kcms/mobileshell/ui/QuickSettingsForm.qml similarity index 100% rename from kcms/mobileshell/package/contents/ui/QuickSettingsForm.qml rename to kcms/mobileshell/ui/QuickSettingsForm.qml diff --git a/kcms/mobileshell/package/contents/ui/VibrationForm.qml b/kcms/mobileshell/ui/VibrationForm.qml similarity index 100% rename from kcms/mobileshell/package/contents/ui/VibrationForm.qml rename to kcms/mobileshell/ui/VibrationForm.qml diff --git a/kcms/mobileshell/package/contents/ui/main.qml b/kcms/mobileshell/ui/main.qml similarity index 100% rename from kcms/mobileshell/package/contents/ui/main.qml rename to kcms/mobileshell/ui/main.qml diff --git a/kcms/powermanagement/CMakeLists.txt b/kcms/powermanagement/CMakeLists.txt index 17226f50..090fcb83 100644 --- a/kcms/powermanagement/CMakeLists.txt +++ b/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) diff --git a/kcms/powermanagement/package/contents/ui/BatteryPage.qml b/kcms/powermanagement/ui/BatteryPage.qml similarity index 100% rename from kcms/powermanagement/package/contents/ui/BatteryPage.qml rename to kcms/powermanagement/ui/BatteryPage.qml diff --git a/kcms/powermanagement/package/contents/ui/Graph.qml b/kcms/powermanagement/ui/Graph.qml similarity index 100% rename from kcms/powermanagement/package/contents/ui/Graph.qml rename to kcms/powermanagement/ui/Graph.qml diff --git a/kcms/powermanagement/package/contents/ui/main.qml b/kcms/powermanagement/ui/main.qml similarity index 100% rename from kcms/powermanagement/package/contents/ui/main.qml rename to kcms/powermanagement/ui/main.qml diff --git a/kcms/time/CMakeLists.txt b/kcms/time/CMakeLists.txt index fb97342b..4bc26954 100644 --- a/kcms/time/CMakeLists.txt +++ b/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) diff --git a/kcms/time/package/contents/ui/DatePicker.qml b/kcms/time/ui/DatePicker.qml similarity index 100% rename from kcms/time/package/contents/ui/DatePicker.qml rename to kcms/time/ui/DatePicker.qml diff --git a/kcms/time/package/contents/ui/Digit.qml b/kcms/time/ui/Digit.qml similarity index 100% rename from kcms/time/package/contents/ui/Digit.qml rename to kcms/time/ui/Digit.qml diff --git a/kcms/time/package/contents/ui/TimePicker.qml b/kcms/time/ui/TimePicker.qml similarity index 100% rename from kcms/time/package/contents/ui/TimePicker.qml rename to kcms/time/ui/TimePicker.qml diff --git a/kcms/time/package/contents/ui/main.qml b/kcms/time/ui/main.qml similarity index 100% rename from kcms/time/package/contents/ui/main.qml rename to kcms/time/ui/main.qml diff --git a/kcms/virtualkeyboard/CMakeLists.txt b/kcms/virtualkeyboard/CMakeLists.txt index a5057020..415f02fc 100644 --- a/kcms/virtualkeyboard/CMakeLists.txt +++ b/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) diff --git a/kcms/virtualkeyboard/package/contents/ui/languages.qml b/kcms/virtualkeyboard/ui/languages.qml similarity index 100% rename from kcms/virtualkeyboard/package/contents/ui/languages.qml rename to kcms/virtualkeyboard/ui/languages.qml diff --git a/kcms/virtualkeyboard/package/contents/ui/main.qml b/kcms/virtualkeyboard/ui/main.qml similarity index 100% rename from kcms/virtualkeyboard/package/contents/ui/main.qml rename to kcms/virtualkeyboard/ui/main.qml diff --git a/kcms/wifi/CMakeLists.txt b/kcms/wifi/CMakeLists.txt index a7dfaf75..d2463c11 100644 --- a/kcms/wifi/CMakeLists.txt +++ b/kcms/wifi/CMakeLists.txt @@ -1,12 +1,7 @@ # SPDX-FileCopyrightText: 2018 Martin Kacej # SPDX-License-Identifier: LGPL-2.0-or-later -project (kcm_mobile_wifi) - -set (wifisettings_SRCS wifisettings.cpp) - -kcoreaddons_add_plugin(kcm_mobile_wifi SOURCES ${wifisettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings") - +kcmutils_add_qml_kcm(kcm_mobile_wifi SOURCES wifisettings.cpp) 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) diff --git a/kcms/wifi/package/contents/ui/ConnectDialog.qml b/kcms/wifi/ui/ConnectDialog.qml similarity index 100% rename from kcms/wifi/package/contents/ui/ConnectDialog.qml rename to kcms/wifi/ui/ConnectDialog.qml diff --git a/kcms/wifi/package/contents/ui/ConnectionItemDelegate.qml b/kcms/wifi/ui/ConnectionItemDelegate.qml similarity index 100% rename from kcms/wifi/package/contents/ui/ConnectionItemDelegate.qml rename to kcms/wifi/ui/ConnectionItemDelegate.qml diff --git a/kcms/wifi/package/contents/ui/NetworkSettings.qml b/kcms/wifi/ui/NetworkSettings.qml similarity index 100% rename from kcms/wifi/package/contents/ui/NetworkSettings.qml rename to kcms/wifi/ui/NetworkSettings.qml diff --git a/kcms/wifi/package/contents/ui/PasswordField.qml b/kcms/wifi/ui/PasswordField.qml similarity index 100% rename from kcms/wifi/package/contents/ui/PasswordField.qml rename to kcms/wifi/ui/PasswordField.qml diff --git a/kcms/wifi/package/contents/ui/main.qml b/kcms/wifi/ui/main.qml similarity index 100% rename from kcms/wifi/package/contents/ui/main.qml rename to kcms/wifi/ui/main.qml