Commit cda2354c authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Implement userfeedback config

parent e074009b
......@@ -91,7 +91,9 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
endif()
if (TARGET KUserFeedbackWidgets)
add_definitions(-DWITH_KUSERFEEDBACK)
endif()
add_subdirectory(export)
add_subdirectory(interfaces)
add_subdirectory(plugins)
......
......@@ -118,3 +118,22 @@ kcoreaddons_desktop_to_json(akregator_config_plugins akregator_config_plugins.de
install(FILES akregator_config_plugins.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### next target ###############
if (TARGET KUserFeedbackWidgets)
set(kcm_akregator_config_userfeedback_SRCS akregator_config_userfeedback.cpp)
add_library(akregator_config_userfeedback MODULE ${kcm_akregator_config_userfeedback_SRCS})
target_link_libraries(akregator_config_userfeedback
akregatorinterfaces
KF5::TextWidgets
KF5::KCMUtils
KF5::I18n
KUserFeedbackWidgets
)
install(FILES akregator_config_userfeedback.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
kcoreaddons_desktop_to_json(akregator_config_userfeedback akregator_config_userfeedback.desktop SERVICE_TYPES kcmodule.desktop)
install(TARGETS akregator_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR})
endif()
......@@ -67,4 +67,4 @@ void KCMAkregatorUserFeedBackConfig::defaults()
{
}
#include "kaddressbook_config_userfeedback.moc"
#include "akregator_config_userfeedback.moc"
......@@ -7,14 +7,28 @@ set(akregatorinterfaces_LIB_SRCS
storagefactoryregistry.cpp
)
set(akregatorinterfaces_userfeedback_LIB_SRCS)
if (TARGET KUserFeedbackWidgets)
set(akregatorinterfaces_userfeedback_LIB_SRCS ${akregatorinterfaces_userfeedback_LIB_SRCS}
userfeedback/userfeedbackmanager.cpp
)
endif()
kconfig_add_kcfg_files(akregatorinterfaces_LIB_SRCS akregatorconfig.kcfgc)
add_library(akregatorinterfaces ${akregatorinterfaces_LIB_SRCS})
add_library(akregatorinterfaces ${akregatorinterfaces_LIB_SRCS} ${akregatorinterfaces_userfeedback_LIB_SRCS})
generate_export_header(akregatorinterfaces BASE_NAME akregatorinterfaces)
set(akregator_userfeedback_LIB)
if (TARGET KUserFeedbackWidgets)
set(akregator_userfeedback_LIB KUserFeedbackWidgets)
endif()
target_link_libraries(akregatorinterfaces
KF5::ConfigGui
Qt5::Widgets
${akregator_userfeedback_LIB}
)
target_include_directories(akregatorinterfaces PUBLIC "$<BUILD_INTERFACE:${akregator_SOURCE_DIR}/interfaces;${akregator_BINARY_DIR}/interfaces>")
......
......@@ -22,10 +22,11 @@
#define USERFEEDBACKMANAGER_H
#include <QObject>
#include "akregatorinterfaces_export.h"
namespace KUserFeedback {
class Provider;
}
class UserFeedBackManager : public QObject
class AKREGATORINTERFACES_EXPORT UserFeedBackManager : public QObject
{
Q_OBJECT
public:
......
......@@ -11,9 +11,6 @@ include_directories(
add_subdirectory(icons)
if (TARGET KUserFeedbackWidgets)
add_definitions(-DWITH_KUSERFEEDBACK)
endif()
########### next target ###############
......@@ -75,15 +72,6 @@ set(akregatorprivate_urlhandlerwebengine_SRCS
urlhandler/webengine/urlhandlerwebenginemanager.cpp
)
set(akregatorprivate_userfeedback_LIB_SRCS)
if (TARGET KUserFeedbackWidgets)
set(akregatorprivate_userfeedback_LIB_SRCS ${akregatorprivate_userfeedback_LIB_SRCS}
userfeedback/userfeedbackmanager.cpp
)
endif()
set(akregatorprivate_LIB_SRCS
${akregatorprivate_userfeedback_LIB_SRCS}
akregratormigrateapplication.cpp
......
......@@ -669,6 +669,10 @@ void Part::showOptions()
m_dialog->addModule(QStringLiteral("akregator_config_browser"));
m_dialog->addModule(QStringLiteral("akregator_config_advanced"));
m_dialog->addModule(QStringLiteral("akregator_config_plugins"));
#ifdef WITH_KUSERFEEDBACK
m_dialog->addModule(QStringLiteral("akregator_config_userfeedback"));
#endif
}
m_dialog->show();
......
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