Commit c175c2c8 authored by Alexander Lohnau's avatar Alexander Lohnau 💬 Committed by Luigi Toscano
Browse files

Install KCMs in new namespaces

This is where systemsettings will look for plugins when not going thourgh KServiceTypeTarder.

This also embeds json metadata in plugins that don't embed it already.

Task: https://phabricator.kde.org/T14517
parent 4af9c5df
......@@ -19,7 +19,7 @@ kcmutils_generate_module_data(
SETTINGS_CLASSES BellSettings KeyboardSettings KeyboardFiltersSettings MouseSettings ScreenReaderSettings
)
kcoreaddons_add_plugin(kcm_access SOURCES ${kcm_access_PART_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_access SOURCES ${kcm_access_PART_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_access
Qt::DBus
......
......@@ -88,7 +88,7 @@ target_link_libraries (kcm_activities
install (
TARGETS kcm_activities
DESTINATION ${KDE_INSTALL_PLUGINDIR}
DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets
)
install (
......
......@@ -15,7 +15,7 @@
#include "SwitchingTab.h"
#include "kactivitiesdata.h"
K_PLUGIN_FACTORY(ActivitiesKCMFactory, registerPlugin<MainConfigurationWidget>(); registerPlugin<KActivitiesData>();)
K_PLUGIN_FACTORY_WITH_JSON(ActivitiesKCMFactory, "kcm_activities.json", registerPlugin<MainConfigurationWidget>(); registerPlugin<KActivitiesData>();)
class MainConfigurationWidget::Private : public Ui::MainConfigurationWidgetBase
{
......
......@@ -7,7 +7,7 @@ set(kcm_file_SRCS
baloodata.cpp
)
kcoreaddons_add_plugin(kcm_baloofile SOURCES ${kcm_file_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_baloofile SOURCES ${kcm_file_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_baloofile
KF5::CoreAddons
......
......@@ -14,7 +14,7 @@ set(componentchooser_SRCS
kconfig_add_kcfg_files(componentchooser_SRCS browser_settings.kcfgc GENERATE_MOC)
kconfig_add_kcfg_files(componentchooser_SRCS terminal_settings.kcfgc GENERATE_MOC)
kcoreaddons_add_plugin(kcm_componentchooser SOURCES ${componentchooser_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_componentchooser SOURCES ${componentchooser_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_componentchooser
Qt::Core
......
......@@ -22,7 +22,7 @@ target_link_libraries(kcm_clock
KF5::KDELibs4Support
)
install(TARGETS kcm_clock DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(TARGETS kcm_clock DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets )
########### next target ###############
#This is only needed when not using timedated and can be removed in future
......
......@@ -25,7 +25,7 @@
#include "timedated_interface.h"
K_PLUGIN_FACTORY(KlockModuleFactory, registerPlugin<KclockModule>();)
K_PLUGIN_CLASS_WITH_JSON(KclockModule, "clock.json")
KclockModule::KclockModule(QWidget *parent, const QVariantList &)
: KCModule(parent)
......
......@@ -25,6 +25,6 @@ target_link_libraries(kcm_desktoppaths
KF5::KIOWidgets
)
install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets)
install(FILES desktoppath.desktop DESTINATION ${KDE_INSTALL_APPDIR})
......@@ -20,7 +20,7 @@
#include <KPluginFactory>
#include <KUrlRequester>
K_PLUGIN_FACTORY(KcmDesktopPathsFactory, registerPlugin<DesktopPathConfig>(); registerPlugin<DesktopPathsData>();)
K_PLUGIN_FACTORY_WITH_JSON(KcmDesktopPathsFactory, "desktoppath.json", registerPlugin<DesktopPathConfig>(); registerPlugin<DesktopPathsData>();)
DesktopPathConfig::DesktopPathConfig(QWidget *parent, const QVariantList &)
: KCModule(parent)
......
......@@ -22,7 +22,7 @@ target_link_libraries(kcm_joystick
KF5::KIOWidgets
)
install(TARGETS kcm_joystick DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(TARGETS kcm_joystick DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets )
########### install files ###############
......
......@@ -19,7 +19,7 @@
#include <QVBoxLayout>
K_PLUGIN_FACTORY(JoystickFactory, registerPlugin<Joystick>();)
K_PLUGIN_CLASS_WITH_JSON(Joystick, "joystick.json")
Joystick::Joystick(QWidget *parent, const QVariantList &)
: KCModule(parent)
......
......@@ -22,7 +22,7 @@ ecm_qt_install_logging_categories(
DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}"
)
kcoreaddons_add_plugin(kcm_kded SOURCES ${kcm_kded_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_kded SOURCES ${kcm_kded_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_kded KF5::QuickAddons KF5::Service KF5::I18n KF5::KCMUtils Qt::DBus)
......
......@@ -132,11 +132,9 @@ target_link_libraries(kcm_keyboard_static
X11::xkbfile
)
kcoreaddons_add_plugin(kcm_keyboard SOURCES kcmmain.cpp INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_keyboard SOURCES kcmmain.cpp INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_keyboard kcm_keyboard_static)
install(TARGETS kcm_keyboard DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install( FILES kcm_keyboard.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
add_subdirectory(kconf_update)
......
......@@ -9,6 +9,6 @@
#include <KPluginFactory>
K_PLUGIN_FACTORY(KeyboardModuleFactory, registerPlugin<KCMKeyboard>(); registerPlugin<KeyboardSettingsData>();)
K_PLUGIN_FACTORY_WITH_JSON(KeyboardModuleFactory, "keyboard.json", registerPlugin<KCMKeyboard>(); registerPlugin<KeyboardSettingsData>();)
#include "kcmmain.moc"
......@@ -42,7 +42,7 @@ ecm_qt_install_logging_categories(
)
kcoreaddons_add_plugin(kcm_keys SOURCES ${kcm_keys_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_keys SOURCES ${kcm_keys_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_keys
Qt::DBus
......
......@@ -15,7 +15,7 @@ qt_add_dbus_interface(kcm_smserver_PART_SRCS org.freedesktop.login1.Manager.xml
kconfig_add_kcfg_files(kcm_smserver_PART_SRCS smserversettings.kcfgc GENERATE_MOC)
kcoreaddons_add_plugin(kcm_smserver SOURCES ${kcm_smserver_PART_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_smserver SOURCES ${kcm_smserver_PART_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_smserver
Qt::Core
......
......@@ -15,7 +15,7 @@ kcmutils_generate_module_data(
kconfig_add_kcfg_files(kcm_splashscreen_SRCS splashscreensettings.kcfgc GENERATE_MOC)
kcoreaddons_add_plugin(kcm_splashscreen SOURCES ${kcm_splashscreen_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_splashscreen SOURCES ${kcm_splashscreen_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_splashscreen
KF5::KIOWidgets
......
......@@ -29,7 +29,7 @@ if (KUserFeedback_FOUND)
kconfig_add_kcfg_files(kcm_landingpage_SRCS landingpage_feedbacksettings.kcfgc GENERATE_MOC)
endif()
kcoreaddons_add_plugin(kcm_landingpage SOURCES ${kcm_landingpage_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_landingpage SOURCES ${kcm_landingpage_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_landingpage
KF5::QuickAddons
......
......@@ -15,7 +15,7 @@ kcmutils_generate_module_data(
kconfig_add_kcfg_files(kcm_launchfeedback_PART_SRCS launchfeedbacksettingsbase.kcfgc GENERATE_MOC)
kcoreaddons_add_plugin(kcm_launchfeedback SOURCES ${kcm_launchfeedback_PART_SRCS} INSTALL_NAMESPACE "kcms")
kcoreaddons_add_plugin(kcm_launchfeedback SOURCES ${kcm_launchfeedback_PART_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
target_link_libraries(kcm_launchfeedback
Qt::DBus
......
......@@ -5,7 +5,7 @@ kconfig_add_kcfg_files(kcm_qtquicksettings_PART_SRCS renderersettings.kcfgc)
ki18n_wrap_ui(kcm_qtquicksettings_PART_SRCS kcmqtquicksettingswidget.ui)
add_library(kcm_qtquicksettings ${kcm_qtquicksettings_PART_SRCS})
add_library(kcm_qtquicksettings MODULE ${kcm_qtquicksettings_PART_SRCS})
target_link_libraries(kcm_qtquicksettings
Qt::Widgets
......@@ -16,5 +16,5 @@ target_link_libraries(kcm_qtquicksettings
########### install files ###############
install(TARGETS kcm_qtquicksettings DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kcm_qtquicksettings DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets)
install(FILES qtquicksettings.desktop DESTINATION ${KDE_INSTALL_APPDIR})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment