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

runners: port to new KRunner metadata system & install location

parent 075a4366
......@@ -6,7 +6,7 @@ set(PROJECT_VERSION "5.19.80")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.12.0")
set(KF5_MIN_VERSION "5.71.0")
set(KF5_MIN_VERSION "5.72.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
......
......@@ -5,11 +5,11 @@ set(krunner_kwin_SRCS
)
add_library(krunner_kwin MODULE ${krunner_kwin_SRCS})
kcoreaddons_desktop_to_json(krunner_kwin plasma-runner-kwin.desktop)
target_link_libraries(krunner_kwin
Qt5::DBus
KF5::KIOCore
KF5::I18n
KF5::Runner)
install(TARGETS krunner_kwin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-kwin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_kwin DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
......@@ -25,7 +25,7 @@
#include <KLocalizedString>
K_EXPORT_PLASMA_RUNNER(kwin, KWinRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(KWinRunner, "plasma-runner-kwin.json")
static const QString s_kwinService = QStringLiteral("org.kde.KWin");
static const QString s_keyword = QStringLiteral("KWin");
......
......@@ -84,7 +84,6 @@ Comment[zh_TW]=與 Plasma 合成器互動
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=kwin
X-KDE-Library=krunner_kwin
X-Plasma-RunnerPhase=first
X-KDE-PluginInfo-Author=Plasma Team
X-KDE-PluginInfo-Email=plasma-devel@kde.org
......
......@@ -5,11 +5,11 @@ set(krunner_plasma-desktop_SRCS
)
add_library(krunner_plasma-desktop MODULE ${krunner_plasma-desktop_SRCS})
kcoreaddons_desktop_to_json(krunner_plasma-desktop plasma-runner-plasma-desktop.desktop)
target_link_libraries(krunner_plasma-desktop
Qt5::DBus
KF5::KIOCore
KF5::I18n
KF5::Runner)
install(TARGETS krunner_plasma-desktop DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-plasma-desktop.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS krunner_plasma-desktop DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
......@@ -26,7 +26,7 @@
#include <KLocalizedString>
K_EXPORT_PLASMA_RUNNER(plasma-desktop, PlasmaDesktopRunner)
K_EXPORT_PLASMA_RUNNER_WITH_JSON(PlasmaDesktopRunner, "plasma-runner-plasma-desktop.json")
static const QString s_plasmaService = QLatin1String("org.kde.plasmashell");
......
......@@ -128,7 +128,6 @@ Comment[zh_TW]=與 Plasma 桌面 shell 互動
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=plasma
X-KDE-Library=krunner_plasma-desktop
X-Plasma-RunnerPhase=first
X-KDE-PluginInfo-Author=Plasma Team
X-KDE-PluginInfo-Email=plasma-devel@kde.org
......
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