GIT_SILENT: it's autogenerated now

CMakeLists.txt

@@ -161,15 +161,11 @@ add_subdirectory(src)
 add_subdirectory(agents)
 add_subdirectory(ktnef)
 add_subdirectory(kmail-refresh-settings)
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    install(FILES kmail.renamecategories kmail.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-else ()
-    ecm_qt_install_logging_categories(
+ecm_qt_install_logging_categories(
         EXPORT KMAIL
         FILE kmail.categories
         DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
         )
-endif()
 
 add_subdirectory(doc)
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

agents/archivemailagent/CMakeLists.txt

@@ -15,15 +15,11 @@ kconfig_add_kcfg_files(libarchivemailagent_SRCS
 
 qt5_add_dbus_adaptor(libarchivemailagent_SRCS org.freedesktop.Akonadi.ArchiveMailAgent.xml archivemailagent.h ArchiveMailAgent)
 
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(libarchivemailagent_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent)
-else()
-    ecm_qt_declare_logging_category(libarchivemailagent_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent
+ecm_qt_declare_logging_category(libarchivemailagent_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent
         DESCRIPTION "kmail (archivemailagent)"
         OLD_CATEGORY_NAMES log_archivemailagent
         EXPORT KMAIL
     )
-endif()
 
 
 ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )

agents/archivemailagent/autotests/CMakeLists.txt

 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../.. )
 
-set(autotest_categories_SRCS)
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(autotest_categories_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent)
-else()
-    ecm_qt_declare_logging_category(autotest_categories_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent
-        DESCRIPTION "kmail (archivemailagent)"
-        OLD_CATEGORY_NAMES log_archivemailagent
-        EXPORT KMAIL
-    )
-endif()
+ecm_qt_declare_logging_category(autotest_categories_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent)
 
 
 # Convenience macro to add unit tests.

agents/followupreminderagent/CMakeLists.txt

@@ -13,15 +13,11 @@ set(followupreminderagent_SRCS
     ${followupreminderagent_job_SRCS}
     )
 
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
-else()
-    ecm_qt_declare_logging_category(followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent
+ecm_qt_declare_logging_category(followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent
         DESCRIPTION "kmail (followupreminderagent)"
         OLD_CATEGORY_NAMES log_followupreminderagent
         EXPORT KMAIL
     )
-endif()
 
 qt5_add_dbus_adaptor(followupreminderagent_SRCS org.freedesktop.Akonadi.FollowUpReminder.xml followupreminderagent.h FollowUpReminderAgent)
 

agents/followupreminderagent/autotests/CMakeLists.txt

@@ -3,15 +3,7 @@ qt5_add_dbus_interface(followupreminderagent_test_SRCS ../org.freedesktop.Notifi
 qt5_add_dbus_interface(followupreminderagent_test_SRCS ../org.freedesktop.DBus.Properties.xml dbusproperties)
 
 set(autotest_categories_followupreminderagent_SRCS)
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(autotest_categories_followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
-else()
-    ecm_qt_declare_logging_category(autotest_categories_followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent
-        DESCRIPTION "kmail (followupreminderagent)"
-        OLD_CATEGORY_NAMES log_followupreminderagent
-        EXPORT KMAIL
-    )
-endif()
+ecm_qt_declare_logging_category(autotest_categories_followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
 
 # Convenience macro to add unit tests.
 macro( followupreminder_agent _source )

agents/mailfilteragent/CMakeLists.txt

@@ -13,15 +13,11 @@ set(akonadi_mailfilter_agent_SRCS
 
 qt5_add_dbus_adaptor(akonadi_mailfilter_agent_SRCS org.freedesktop.Akonadi.MailFilterAgent.xml mailfilteragent.h MailFilterAgent)
 
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(akonadi_mailfilter_agent_SRCS HEADER mailfilteragent_debug.h IDENTIFIER MAILFILTERAGENT_LOG CATEGORY_NAME org.kde.pim.mailfilteragent)
-else()
-    ecm_qt_declare_logging_category(akonadi_mailfilter_agent_SRCS HEADER mailfilteragent_debug.h IDENTIFIER MAILFILTERAGENT_LOG CATEGORY_NAME org.kde.pim.mailfilteragent
+ecm_qt_declare_logging_category(akonadi_mailfilter_agent_SRCS HEADER mailfilteragent_debug.h IDENTIFIER MAILFILTERAGENT_LOG CATEGORY_NAME org.kde.pim.mailfilteragent
         DESCRIPTION "kmail (mailfilter agent)"
         OLD_CATEGORY_NAMES log_mailfilteragent
         EXPORT KMAIL
     )
-endif()
 
 
 add_executable(akonadi_mailfilter_agent ${akonadi_mailfilter_agent_SRCS})

agents/sendlateragent/CMakeLists.txt

@@ -6,15 +6,11 @@ if(BUILD_TESTING)
 endif()
 
 set(sendlater_common_SRCS)
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(sendlater_common_SRCS HEADER sendlateragent_debug.h IDENTIFIER SENDLATERAGENT_LOG CATEGORY_NAME org.kde.pim.sendlateragent)
-else()
-    ecm_qt_declare_logging_category(sendlater_common_SRCS HEADER sendlateragent_debug.h IDENTIFIER SENDLATERAGENT_LOG CATEGORY_NAME org.kde.pim.sendlateragent
+ecm_qt_declare_logging_category(sendlater_common_SRCS HEADER sendlateragent_debug.h IDENTIFIER SENDLATERAGENT_LOG CATEGORY_NAME org.kde.pim.sendlateragent
         DESCRIPTION "kmail (sendlateragent)"
         OLD_CATEGORY_NAMES log_sendlateragent
         EXPORT KMAIL
     )
-endif()
 
 
 set(sendlateragentconfig_SRCS

agents/unifiedmailboxagent/CMakeLists.txt

@@ -13,14 +13,10 @@ set(unifiedmailbox_agent_SRCS
     settingsdialog.cpp
     mailkernel.cpp
 )
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(unifiedmailbox_agent_SRCS HEADER unifiedmailboxagent_debug.h IDENTIFIER UNIFIEDMAILBOXAGENT_LOG CATEGORY_NAME org.kde.pim.unifiedmailboxagent)
-else()
-    ecm_qt_declare_logging_category(unifiedmailbox_agent_SRCS HEADER unifiedmailboxagent_debug.h IDENTIFIER UNIFIEDMAILBOXAGENT_LOG CATEGORY_NAME org.kde.pim.unifiedmailboxagent
+ecm_qt_declare_logging_category(unifiedmailbox_agent_SRCS HEADER unifiedmailboxagent_debug.h IDENTIFIER UNIFIEDMAILBOXAGENT_LOG CATEGORY_NAME org.kde.pim.unifiedmailboxagent
         DESCRIPTION "kmail (unifiedmailboxagent)"
         EXPORT KMAIL
     )
-endif()
 
 kconfig_add_kcfg_files(unifiedmailbox_agent_SRCS
     settings.kcfgc

kmail-refresh-settings/CMakeLists.txt

@@ -6,14 +6,10 @@ set(kmail-refresh-settings_SRCS
     refreshsettingsfirstpage.cpp
     )
 
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(kmail-refresh-settings_SRCS HEADER kmail-refresh-settings_debug.h IDENTIFIER KMAIL_REFRESH_SETTINGS_LOG CATEGORY_NAME org.kde.pim.kmail_refresh_settings)
-else()
-    ecm_qt_declare_logging_category(kmail-refresh-settings_SRCS HEADER kmail-refresh-settings_debug.h IDENTIFIER KMAIL_REFRESH_SETTINGS_LOG CATEGORY_NAME org.kde.pim.kmail_refresh_settings
+ecm_qt_declare_logging_category(kmail-refresh-settings_SRCS HEADER kmail-refresh-settings_debug.h IDENTIFIER KMAIL_REFRESH_SETTINGS_LOG CATEGORY_NAME org.kde.pim.kmail_refresh_settings
         DESCRIPTION "kmail-refresh-settings"
         EXPORT KMAIL
     )
-endif()
 
 
 add_executable(kmail-refresh-settings ${kmail-refresh-settings_SRCS})

kmail.categories

-org.kde.pim.kmail kmail (kmail) IDENTIFIER [KMAIL_LOG]
-org.kde.pim.sendlateragent kmail (sendlateragent) IDENTIFIER [SENDLATERAGENT_LOG]
-org.kde.pim.archivemailagent kmail (archivemailagent) IDENTIFIER [ARCHIVEMAILAGENT_LOG]
-org.kde.pim.followupreminderagent kmail (followupreminderagent) IDENTIFIER [FOLLOWUPREMINDERAGENT_LOG]
-org.kde.pim.kmail_plugin kmail (kmail kontact plugins) IDENTIFIER [KMAILPLUGIN_LOG]
-org.kde.pim.mailfilteragent kmail (mailfilter agent) IDENTIFIER [MAILFILTERAGENT_LOG]
-org.kde.pim.unifiedmailboxagent kmail (unifiedmailboxagent) IDENTIFIER [UNIFIEDMAILBOXAGENT_LOG]
-org.kde.pim.kmail_refresh_settings kmail-refresh-settings IDENTIFIER [KMAIL_REFRESH_SETTINGS_LOG]
-org.kde.pim.ktnefapps ktnef IDENTIFIER [KTNEFAPPS_LOG]

kmail.renamecategories

-log_kmail org.kde.pim.kmail
-log_sendlateragent org.kde.pim.sendlateragent
-log_archivemailagent org.kde.pim.archivemailagent
-log_followupreminderagent org.kde.pim.followupreminderagent
-log_kmail_plugin org.kde.pim.kmail_plugin
-log_mailfilteragent org.kde.pim.mailfilteragent
-

ktnef/src/CMakeLists.txt

@@ -12,14 +12,10 @@ set(ktnef_SRCS
     )
 qt5_add_resources(ktnef_SRCS ktnef.qrc)
 
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(ktnef_SRCS HEADER ktnef_debug.h IDENTIFIER KTNEFAPPS_LOG CATEGORY_NAME org.kde.pim.ktnefapps)
-else()
-    ecm_qt_declare_logging_category(ktnef_SRCS HEADER ktnef_debug.h IDENTIFIER KTNEFAPPS_LOG CATEGORY_NAME org.kde.pim.ktnefapps
+ecm_qt_declare_logging_category(ktnef_SRCS HEADER ktnef_debug.h IDENTIFIER KTNEFAPPS_LOG CATEGORY_NAME org.kde.pim.ktnefapps
         DESCRIPTION "kmail-refresh-settings"
         EXPORT KMAIL
     )
-endif()
 
 
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hicolor/*-apps-ktnef.png")

src/CMakeLists.txt

@@ -194,15 +194,11 @@ if (TARGET KUserFeedbackWidgets)
 endif()
 
 set(kmail_common_SRCS)
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(kmail_common_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME org.kde.pim.kmail)
-else()
-    ecm_qt_declare_logging_category(kmail_common_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME org.kde.pim.kmail
+ecm_qt_declare_logging_category(kmail_common_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME org.kde.pim.kmail
         DESCRIPTION "kmail (kmail)"
         OLD_CATEGORY_NAMES log_kmail
         EXPORT KMAIL
     )
-endif()
 
 set(kmailprivate_LIB_SRCS
     ${kmail_common_SRCS}

src/kontactplugin/kmail/CMakeLists.txt

@@ -2,15 +2,11 @@
 
 set(kontact_kmail_plugins_interface_common_SRCS)
 
-if (ECM_VERSION VERSION_LESS "5.68.0")
-    ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_plugin)
-else()
-    ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_plugin
+ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_plugin
         DESCRIPTION "kmail (kmail kontact plugins)"
         OLD_CATEGORY_NAMES log_kmail_plugin
         EXPORT KMAIL
     )
-endif()
 
 
 set(kontact_kmail_plugins_interface_SRCS)