From c0112f7762ceeb101d3d1bb773830ea173cabc0c Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 20 Sep 2016 07:18:21 +0200 Subject: [PATCH] Rename categories --- CMakeLists.txt | 2 +- mailcommon.categories | 2 +- mailcommon.renamecategories | 1 + src/CMakeLists.txt | 2 +- src/filter/autotests/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 mailcommon.renamecategories diff --git a/CMakeLists.txt b/CMakeLists.txt index 51ce5df..bd78f00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,5 +114,5 @@ install(FILES add_subdirectory(src) add_subdirectory(autotests) -install( FILES mailcommon.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install( FILES mailcommon.renamecategories mailcommon.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/mailcommon.categories b/mailcommon.categories index d9339e6..cfc3a05 100644 --- a/mailcommon.categories +++ b/mailcommon.categories @@ -1 +1 @@ -log_mailcommon mailcommon (mailcommon) +org.kde.pim.mailcommon mailcommon (mailcommon) diff --git a/mailcommon.renamecategories b/mailcommon.renamecategories new file mode 100644 index 0000000..45a6070 --- /dev/null +++ b/mailcommon.renamecategories @@ -0,0 +1 @@ +log_mailcommon org.kde.pim.mailcommon diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c3e53a9..4f48703 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -181,7 +181,7 @@ kconfig_add_kcfg_files(libmailcommon_SRCS settings/mailcommonsettings_base.kcfgc ) -ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME log_mailcommon) +ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME org.kde.pim.mailcommon) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterfaces/org.freedesktop.Akonadi.MailFilterAgent.xml PROPERTIES INCLUDE "dbusoperators.h") diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt index 3197788..0db6ce2 100644 --- a/src/filter/autotests/CMakeLists.txt +++ b/src/filter/autotests/CMakeLists.txt @@ -18,7 +18,7 @@ macro(add_mailcommon_filter_akonadi_test _name _sources) endmacro() set(filter_common_SRCS) -ecm_qt_declare_logging_category(filter_common_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME log_mailcommon) +ecm_qt_declare_logging_category(filter_common_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME org.kde.pim.mailcommon) add_mailcommon_filter_test(itemcontexttest itemcontexttest.cpp