Commit a4f71924 authored by Ragnar Thomsen's avatar Ragnar Thomsen

Port solid-automounter and keyboard kded plugins to json metadata...

and disable installation of the desktop files.
parent 5ef71dc3
......@@ -35,7 +35,10 @@ set( kded_keyboard_SRCS
xkb_rules.cpp
)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(kded_keyboard MODULE ${kded_keyboard_SRCS})
set_target_properties(kded_keyboard PROPERTIES OUTPUT_NAME keyboard)
kcoreaddons_desktop_to_json(kded_keyboard keyboard.desktop)
target_link_libraries(kded_keyboard
Qt5::Concurrent
......@@ -68,8 +71,7 @@ if(XiGetDevicePresence_FOUND)
target_link_libraries(kded_keyboard ${X11_Xinput_LIB})
endif()
install( TARGETS kded_keyboard DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES keyboard.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install( TARGETS kded_keyboard DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded )
### widget lib ###
......
......@@ -38,8 +38,9 @@
#include "layout_memory_persister.h"
#include "layouts_menu.h"
K_PLUGIN_FACTORY(KeyboardFactory, registerPlugin<KeyboardDaemon>();)
K_PLUGIN_FACTORY_WITH_JSON(KeyboardFactory,
"keyboard.json",
registerPlugin<KeyboardDaemon>();)
KeyboardDaemon::KeyboardDaemon(QObject *parent, const QList<QVariant>&)
: KDEDModule(parent),
......
......@@ -3,9 +3,8 @@ set(kded_device_automounter_SRCS DeviceAutomounter.cpp)
kconfig_add_kcfg_files(kded_device_automounter_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../lib/AutomounterSettingsBase.kcfgc)
add_library(kded_device_automounter MODULE ${device_automounter_lib_SRCS} ${kded_device_automounter_SRCS})
set_target_properties(kded_device_automounter PROPERTIES OUTPUT_NAME device_automounter)
kcoreaddons_desktop_to_json(kded_device_automounter device_automounter.desktop)
target_link_libraries(kded_device_automounter KF5::CoreAddons KF5::Service KF5::ConfigCore KF5::ConfigGui KF5::DBusAddons KF5::Solid)
install(TARGETS kded_device_automounter DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES device_automounter.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
install(TARGETS kded_device_automounter DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded)
......@@ -28,8 +28,9 @@
#include <QTimer>
K_PLUGIN_FACTORY(DeviceAutomounterFactory, registerPlugin<DeviceAutomounter>();)
K_EXPORT_PLUGIN(DeviceAutomounterFactory("kded_device_automounter"))
K_PLUGIN_FACTORY_WITH_JSON(DeviceAutomounterFactory,
"device_automounter.json",
registerPlugin<DeviceAutomounter>();)
DeviceAutomounter::DeviceAutomounter(QObject *parent, const QVariantList &args)
: KDEDModule(parent)
......
Markdown is supported
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