Commit 97398417 authored by Alexander Lohnau's avatar Alexander Lohnau 💬 Committed by Andrius Štikonas
Browse files

Install plugins in "ktorrent_plugins" namespace

This way we don't have conflicts when the executable has the same name
as the plugin namespace.
Putting the plugins in the "plugins" subfolder, solved this issue, but that
has broken some unit tests. See frameworks/kcoreaddons!164.
parent ad77d8c9
Pipeline #113623 passed with stage
in 4 minutes and 19 seconds
......@@ -39,7 +39,7 @@ PluginManager::~PluginManager()
void PluginManager::loadPluginList()
{
pluginsMetaData = KPluginLoader::findPlugins(QStringLiteral("ktorrent"));
pluginsMetaData = KPluginLoader::findPlugins(QStringLiteral("ktorrent_plugins"));
if (!prefpage) {
prefpage = new PluginActivity(this);
......
......@@ -8,6 +8,10 @@ else (${_option})
endif (${_option})
ENDMACRO (MACRO_KT_PLUGIN)
function(ktorrent_add_plugin name)
kcoreaddons_add_plugin(${name} INSTALL_NAMESPACE "ktorrent_plugins")
endfunction()
macro_kt_plugin(ENABLE_LOGVIEWER_PLUGIN logviewer logviewer)
macro_kt_plugin(ENABLE_INFOWIDGET_PLUGIN infowidget infowidget)
if (HAVE_KF5Completion)
......
kcoreaddons_add_plugin(ktorrent_bwscheduler INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_bwscheduler)
set(ktbwschedulerplugin_dbus_SRC)
set(screensaver_xml ${KTORRENT_DBUS_XML_DIR}/org.freedesktop.ScreenSaver.xml)
......
kcoreaddons_add_plugin(ktorrent_downloadorder INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_downloadorder)
target_sources(ktorrent_downloadorder PRIVATE
downloadorderplugin.cpp
......
......@@ -19,7 +19,7 @@ if (BUILD_WITH_GEOIP)
endif()
endif(BUILD_WITH_GEOIP)
kcoreaddons_add_plugin(ktorrent_infowidget INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_infowidget)
target_sources(ktorrent_infowidget PRIVATE
infowidgetplugin.cpp
......
kcoreaddons_add_plugin(ktorrent_ipfilter INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_ipfilter)
target_sources(ktorrent_ipfilter PRIVATE
ipblocklist.cpp
......
kcoreaddons_add_plugin(ktorrent_logviewer INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_logviewer)
target_sources(ktorrent_logviewer PRIVATE
logviewerplugin.cpp
......
kcoreaddons_add_plugin(ktorrent_magnetgenerator INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_magnetgenerator)
target_sources(ktorrent_magnetgenerator PRIVATE
magnetgeneratorprefwidget.cpp
......
......@@ -3,7 +3,7 @@ find_package(Taglib REQUIRED)
#include_directories(${Qt5Multimedia_INCLUDE_DIRS})
include_directories(SYSTEM ${PHONON_INCLUDES})
kcoreaddons_add_plugin(ktorrent_mediaplayer INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_mediaplayer)
set(ktmediaplayerplugin_dbus_SRC)
set(screensaver_xml ${KTORRENT_DBUS_XML_DIR}/org.freedesktop.ScreenSaver.xml)
......
kcoreaddons_add_plugin(ktorrent_scanfolder INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_scanfolder)
target_sources(ktorrent_scanfolder PRIVATE
scanthread.cpp
......
kcoreaddons_add_plugin(ktorrent_scanforlostfiles INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_scanforlostfiles)
target_sources(ktorrent_scanforlostfiles PRIVATE
scanforlostfilesplugin.cpp
......
kcoreaddons_add_plugin(ktorrent_search INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_search)
target_sources(ktorrent_search PRIVATE
webview.cpp
......
include_directories(${CMAKE_BINARY_DIR})
kcoreaddons_add_plugin(ktorrent_shutdown INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_shutdown)
set(ktshutdownplugin_dbus_SRC)
......
......@@ -2,7 +2,7 @@ include_directories(${CMAKE_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/drawer)
kcoreaddons_add_plugin(ktorrent_stats INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_stats)
target_sources(ktorrent_stats PRIVATE
drawer/ChartDrawer.cc
......
kcoreaddons_add_plugin(ktorrent_syndication INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_syndication)
target_sources(ktorrent_syndication PRIVATE
syndicationplugin.cpp
......
kcoreaddons_add_plugin(ktorrent_upnp INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_upnp)
target_sources(ktorrent_upnp PRIVATE
upnpplugin.cpp
......
kcoreaddons_add_plugin(ktorrent_zeroconf INSTALL_NAMESPACE "ktorrent")
ktorrent_add_plugin(ktorrent_zeroconf)
target_sources(ktorrent_zeroconf PRIVATE
zeroconfplugin.cpp
......
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