Autogenerate categories file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc682e2fbf2dbfe3acce9ef65d7f90ae125d6e25..cb6397f76ae5abd9da756f4cd7627277c1cd90f8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,10 @@ ecm_generate_dbus_service_file(
 
 ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
 
 
 ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
 

-install(FILES dolphin.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-
+ecm_qt_install_logging_categories(
+        EXPORT DOLPHIN
+        FILE dolphin.categories
+        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+        )

 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

diff --git a/dolphin.categories b/dolphin.categories
deleted file mode 100644 (file)
index 8faeb20..0000000
--- a/dolphin.categories
+++ /dev/null
@@ -1 +0,0 @@
-org.kde.dolphin dolphin IDENTIFIER [DolphinDebug]

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26e02cfb5ce1e940b3aae54f092a4937494be77b..fd3e771b7ae9a9ccfbe405781f922ae7c00daca3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -117,7 +117,8 @@ set(dolphinprivate_LIB_SRCS
     dolphinnewfilemenu.cpp
 )
 
     dolphinnewfilemenu.cpp
 )
 

-ecm_qt_declare_logging_category(dolphinprivate_LIB_SRCS HEADER dolphindebug.h IDENTIFIER DolphinDebug CATEGORY_NAME org.kde.dolphin)
+ecm_qt_declare_logging_category(dolphinprivate_LIB_SRCS HEADER dolphindebug.h IDENTIFIER DolphinDebug CATEGORY_NAME org.kde.dolphin
+    DESCRIPTION "dolphin" EXPORT DOLPHIN)

 
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS
 
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS