Commit 3c41e2c1 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

runners: port to new KRunner metadata system & install location

parent c647c2de
......@@ -5,7 +5,7 @@ set(krunner_activities_SRCS
)
add_library(krunner_activities MODULE ${krunner_activities_SRCS})
kcoreaddons_desktop_to_json(krunner_activities plasma-runner-activityrunner.desktop )
target_link_libraries(krunner_activities KF5::Runner KF5::I18n KF5::Activities)
install(TARGETS krunner_activities DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-activityrunner.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_activities DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
......@@ -22,7 +22,7 @@
#include <QIcon>
#include <klocalizedstring.h>
K_EXPORT_PLASMA_RUNNER(activities, ActivityRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(ActivityRunner, "plasma-runner-activityrunner.json")
ActivityRunner::ActivityRunner(QObject *parent, const QVariantList &args)
: Plasma::AbstractRunner(parent, args),
......
......@@ -118,7 +118,6 @@ Comment[zh_TW]=列出並在桌面活動間切換
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=preferences-desktop-activities
X-KDE-Library=krunner_activities
X-KDE-PluginInfo-Author=Plasma Team
X-KDE-PluginInfo-Email=plasma-devel@kde.org
X-KDE-PluginInfo-Name=org.kde.activities
......
......@@ -11,7 +11,7 @@ ecm_qt_declare_logging_category(krunner_appstream_SRCS
DEFAULT_SEVERITY Warning)
add_library(krunner_appstream MODULE ${krunner_appstream_SRCS})
kcoreaddons_desktop_to_json(krunner_appstream plasma-runner-appstream.desktop )
target_link_libraries(krunner_appstream PUBLIC KF5::Runner KF5::I18n KF5::Service AppStreamQt)
install(TARGETS krunner_appstream DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-appstream.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_appstream DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
......@@ -32,7 +32,7 @@
#include "debug.h"
K_EXPORT_PLASMA_RUNNER(installer, InstallerRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(InstallerRunner, "plasma-runner-appstream.json")
InstallerRunner::InstallerRunner(QObject *parent, const QVariantList &args)
: Plasma::AbstractRunner(parent, args)
......
......@@ -84,8 +84,6 @@ Comment[zh_TW]=讓您尋找軟體
Icon=applications-other
Type=Service
X-KDE-ServiceTypes=Plasma/Runner
X-KDE-Library=krunner_appstream
X-KDE-PluginInfo-Author=Aleix Pol Gonzalez
X-KDE-PluginInfo-Email=aleixpol@blue-systems.com
X-KDE-PluginInfo-Version=0.1
......
......@@ -26,7 +26,7 @@ install(
install(
FILES plasma-runner-baloosearch.desktop
DESTINATION ${KDE_INSTALL_KSERVICES5DIR}
DESTINATION "${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins"
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.baloorunner.service
......
......@@ -41,6 +41,7 @@ set(krunner_bookmarksrunner_SRCS
add_library(krunner_bookmarksrunner MODULE ${krunner_bookmarksrunner_SRCS})
kcoreaddons_desktop_to_json(krunner_bookmarksrunner plasma-runner-bookmarks.desktop )
target_link_libraries(krunner_bookmarksrunner ${EXTERNAL_LIBS})
set(krunner_bookmarks_test_SRCS
......@@ -56,12 +57,7 @@ target_link_libraries(krunner_bookmarks_test
KF5::Runner
)
install(TARGETS krunner_bookmarksrunner DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install(FILES plasma-runner-bookmarks.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_bookmarksrunner DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
# Currently tests include only chrome, so no need to get include them if json is not found
if(BUILD_TESTING)
......
......@@ -37,7 +37,7 @@
#include "browserfactory.h"
#include "bookmarksrunner_defs.h"
K_EXPORT_PLASMA_RUNNER(bookmarksrunner, BookmarksRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(BookmarksRunner, "plasma-runner-bookmarks.json")
BookmarksRunner::BookmarksRunner( QObject* parent, const QVariantList &args )
......
......@@ -149,7 +149,6 @@ Comment[zh_TW]=尋找並開啟書籤
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=bookmarks
X-KDE-Library=krunner_bookmarksrunner
X-KDE-PluginInfo-Author=Glenn Ergeerts, Marco Gulino
X-KDE-PluginInfo-Email=glenn.ergeerts@telenet.be, marco.gulino@gmail.com
X-KDE-PluginInfo-Name=bookmarks
......
......@@ -26,6 +26,7 @@ set(krunner_calculatorrunner_SRCS
if ( QALCULATE_FOUND )
add_library(krunner_calculatorrunner MODULE ${qalculate_engine_SRCS} ${krunner_calculatorrunner_SRCS})
kcoreaddons_desktop_to_json(krunner_calculatorrunner plasma-runner-calculator.desktop )
target_link_libraries(krunner_calculatorrunner
${QALCULATE_LIBRARIES}
${CLN_LIBRARIES}
......@@ -37,6 +38,7 @@ if ( QALCULATE_FOUND )
)
else ()
add_library(krunner_calculatorrunner MODULE ${krunner_calculatorrunner_SRCS})
kcoreaddons_desktop_to_json(krunner_calculatorrunner plasma-runner-calculator.desktop )
target_link_libraries(krunner_calculatorrunner
KF5::Runner
KF5::I18n
......@@ -45,7 +47,4 @@ else ()
)
endif ()
install(TARGETS krunner_calculatorrunner DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install(FILES plasma-runner-calculator.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_calculatorrunner DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner" )
......@@ -36,7 +36,7 @@
#include <KLocalizedString>
#include <krunner/querymatch.h>
K_EXPORT_PLASMA_RUNNER(calculatorrunner, CalculatorRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(CalculatorRunner, "plasma-runner-calculator.json")
CalculatorRunner::CalculatorRunner(QObject *parent, const QVariantList &args)
: Plasma::AbstractRunner(parent, args)
......
......@@ -161,7 +161,6 @@ Comment[zh_TW]=計算機表示式
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=accessories-calculator
X-KDE-Library=krunner_calculatorrunner
X-KDE-PluginInfo-Author=Plasma Team
X-KDE-PluginInfo-Email=plasma-devel@kde.org
X-KDE-PluginInfo-Name=calculator
......
......@@ -18,6 +18,7 @@ target_link_libraries(kcm_krunner_kill
)
add_library(krunner_kill MODULE killrunner.cpp)
kcoreaddons_desktop_to_json(krunner_kill plasma-runner-kill.desktop)
target_link_libraries(krunner_kill
KF5::I18n
KF5::Completion
......@@ -28,5 +29,6 @@ target_link_libraries(krunner_kill
)
add_dependencies(krunner_kill kcm_krunner_kill)
install(TARGETS krunner_kill kcm_krunner_kill DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-kill.desktop plasma-runner-kill_config.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_kill DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
install(TARGETS kcm_krunner_kill DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-kill_config.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -31,7 +31,7 @@
#include <processcore/processes.h>
#include <processcore/process.h>
K_EXPORT_PLASMA_RUNNER(kill, KillRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(KillRunner, "plasma-runner-kill.json")
KillRunner::KillRunner(QObject *parent, const QVariantList &args)
: Plasma::AbstractRunner(parent, args), m_processes(nullptr)
......
......@@ -134,7 +134,6 @@ Icon=application-exit
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
X-KDE-Library=krunner_kill
X-KDE-PluginInfo-Author=Jan Gerrit Marker
X-KDE-PluginInfo-Email=jangerrit@weiler-marker.com
X-KDE-PluginInfo-Name=Kill Runner
......
......@@ -5,6 +5,7 @@ set(krunner_locations_SRCS
)
add_library(krunner_locations MODULE ${krunner_locations_SRCS})
kcoreaddons_desktop_to_json(krunner_locations plasma-runner-locations.desktop)
target_link_libraries(krunner_locations
KF5::KIOCore
KF5::KIOWidgets
......@@ -12,6 +13,4 @@ target_link_libraries(krunner_locations
KF5::Runner
)
install(TARGETS krunner_locations DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(FILES plasma-runner-locations.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_locations DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner" )
......@@ -32,7 +32,7 @@
#include <kservicetypetrader.h>
K_EXPORT_PLASMA_RUNNER(locations, LocationsRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(LocationsRunner, "plasma-runner-locations.json")
LocationsRunner::LocationsRunner(QObject *parent, const QVariantList& args)
......
......@@ -154,7 +154,6 @@ Comment[zh_TW]=檔案與網址開啟器
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=system-file-manager
X-KDE-Library=krunner_locations
X-KDE-PluginInfo-Author=Plasma Team
X-KDE-PluginInfo-Email=plasma-devel@kde.org
X-KDE-PluginInfo-Name=locations
......
......@@ -5,7 +5,7 @@ set(krunner_placesrunner_SRCS
)
add_library(krunner_placesrunner MODULE ${krunner_placesrunner_SRCS})
kcoreaddons_desktop_to_json(krunner_placesrunner plasma-runner-places.desktop)
target_link_libraries(krunner_placesrunner
KF5::KIOCore
KF5::KIOWidgets
......@@ -14,7 +14,4 @@ target_link_libraries(krunner_placesrunner
KF5::Runner
)
install(TARGETS krunner_placesrunner DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(FILES plasma-runner-places.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_placesrunner DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner" )
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