diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,6 +169,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/kio_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES kio.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/kio.categories b/kio.categories deleted file mode 100644 --- a/kio.categories +++ /dev/null @@ -1,20 +0,0 @@ -kf5.kio.cookiejar kcookiejar (KIO) IDENTIFIER [KIO_COOKIEJAR] -kf5.kio.core.copyjob KIO::CopyJob (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KIO_COPYJOB_DEBUG] -kf5.kio.core.dirlister KCoreDirLister (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KIO_CORE_DIRLISTER] -kf5.kio.core KIOCore (KIO) IDENTIFIER [KIO_CORE] -kf5.kio.core.sambashare sambashare (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KIO_CORE_SAMBASHARE] -kf5.kiod KIO Daemon (KIO) IDENTIFIER [KIOD_CATEGORY] -kf5.kio.favicons FavIcons (KIO) IDENTIFIER [FAVICONS_LOG] -kf5.kio.kdirmodel KDirModel (KIO) IDENTIFIER [category] -kf5.kio.kio_file kiofile (KIO) IDENTIFIER [KIO_FILE] -kf5.kio.kio_ftp kio ftp (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KIO_FTP] -kf5.kio.kio_http KIO HTTP slave (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KIO_HTTP] -kf5.kio.kio_http.auth kio http auth (KIO) IDENTIFIER [KIO_HTTP_AUTH] -kf5.kio.kio_http.filter kio http filter (KIO) IDENTIFIER [KIO_HTTP_FILTER] -kf5.kio.trash kio trash (KIO) IDENTIFIER [KIO_TRASH] -kf5.kio.useragentdlg kio useragentdialog (KIO) IDENTIFIER [KIO_USERAGENTDLG] -kf5.kio.widgets KIOWidgets (KIO) IDENTIFIER [KIO_WIDGETS] -org.kde.kio.kpasswdserver KPasswdServer (KIO) IDENTIFIER [category] -org.kde.kurifilter-localdomain KUriFilter Local Domain (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [category] -org.kde.kurifilter-ikws KUriFilter IKWS (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [category] -org.kde.kurifilter-shorturi KUriFilter Shorturi (KIO) DEFAULT_SEVERITY [WARNING] IDENTIFIER [category] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,6 +40,12 @@ endif() +ecm_qt_install_logging_categories( + EXPORT KIO + FILE kio.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) + if (BUILD_QCH) macro(_make_absolute var_name base_path) set(_result) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -95,7 +95,37 @@ batchrenamejob.cpp ) -ecm_qt_declare_logging_category(kiocore_SRCS HEADER kiocoredebug.h IDENTIFIER KIO_CORE CATEGORY_NAME kf5.kio.core) +ecm_qt_declare_logging_category(kiocore_SRCS + HEADER kiocoredebug.h + IDENTIFIER KIO_CORE + CATEGORY_NAME kf5.kio.core + DESCRIPTION "KIOCore (KIO)" + EXPORT KIO +) + +ecm_qt_export_logging_category( + IDENTIFIER KIO_COPYJOB_DEBUG + CATEGORY_NAME kf5.kio.core.copyjob + DEFAULT_SEVERITY Warning + DESCRIPTION "KIO::CopyJob (KIO)" + EXPORT KIO +) + +ecm_qt_export_logging_category( + IDENTIFIER KIO_CORE_DIRLISTER + CATEGORY_NAME kf5.kio.core.dirlister + DEFAULT_SEVERITY Warning + DESCRIPTION "KCoreDirLister (KIO)" + EXPORT KIO +) + +ecm_qt_export_logging_category( + IDENTIFIER KIO_CORE_SAMBASHARE + CATEGORY_NAME kf5.kio.core.sambashare + DEFAULT_SEVERITY Warning + DESCRIPTION "sambashare (KIO)" + EXPORT KIO +) if (UNIX) set(kiocore_SRCS ${kiocore_SRCS} diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -2,7 +2,13 @@ faviconrequestjob.cpp ) -ecm_qt_declare_logging_category(kiogui_SRCS HEADER favicons_debug.h IDENTIFIER FAVICONS_LOG CATEGORY_NAME kf5.kio.favicons) +ecm_qt_declare_logging_category(kiogui_SRCS + HEADER favicons_debug.h + IDENTIFIER FAVICONS_LOG + CATEGORY_NAME kf5.kio.favicons + DESCRIPTION "FavIcons (KIO)" + EXPORT KIO +) add_library(KF5KIOGui ${kiogui_SRCS}) generate_export_header(KF5KIOGui BASE_NAME KIOGui) diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt --- a/src/ioslaves/file/CMakeLists.txt +++ b/src/ioslaves/file/CMakeLists.txt @@ -22,6 +22,13 @@ configure_file(config-kioslave-file.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-file.h ) +ecm_qt_export_logging_category( + IDENTIFIER KIO_FILE + CATEGORY_NAME kf5.kio.kio_file + DESCRIPTION "kiofile (KIO)" + EXPORT KIO +) + add_library(kio_file MODULE ${kio_file_PART_SRCS}) target_link_libraries(kio_file KF5::KIOCore KF5::I18n Qt5::DBus Qt5::Network) diff --git a/src/ioslaves/ftp/CMakeLists.txt b/src/ioslaves/ftp/CMakeLists.txt --- a/src/ioslaves/ftp/CMakeLists.txt +++ b/src/ioslaves/ftp/CMakeLists.txt @@ -10,6 +10,13 @@ ftp.cpp ) +ecm_qt_export_logging_category( + IDENTIFIER KIO_FTP + CATEGORY_NAME kf5.kio.kio_ftp + DEFAULT_SEVERITY Warning + DESCRIPTION "kio ftp (KIO)" + EXPORT KIO +) add_library(kio_ftp MODULE ${kio_ftp_PART_SRCS}) target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n) diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt --- a/src/ioslaves/http/CMakeLists.txt +++ b/src/ioslaves/http/CMakeLists.txt @@ -62,6 +62,27 @@ httpfilter.cpp ) +ecm_qt_export_logging_category( + IDENTIFIER KIO_HTTP + CATEGORY_NAME kf5.kio.kio_http + DEFAULT_SEVERITY Warning + DESCRIPTION "KIO HTTP slave (KIO)" + EXPORT KIO +) + +ecm_qt_export_logging_category( + IDENTIFIER KIO_HTTP_AUTH + CATEGORY_NAME kf5.kio.kio_http.auth + DESCRIPTION "kio http auth (KIO)" + EXPORT KIO +) + +ecm_qt_export_logging_category( + IDENTIFIER KIO_HTTP_FILTER + CATEGORY_NAME kf5.kio.kio_http.filter + DESCRIPTION "kio http filter (KIO)" + EXPORT KIO +) add_library(kio_http MODULE ${kio_http_PART_SRCS}) diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt --- a/src/ioslaves/http/kcookiejar/CMakeLists.txt +++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt @@ -24,6 +24,13 @@ kcookiewin.cpp ) +ecm_qt_export_logging_category( + IDENTIFIER KIO_COOKIEJAR + CATEGORY_NAME kf5.kio.cookiejar + DESCRIPTION "kcookiejar (KIO)" + EXPORT KIO +) + qt5_add_dbus_adaptor( kded_kcookiejar_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCookieServer.xml kcookieserver.h KCookieServer ) diff --git a/src/ioslaves/remote/CMakeLists.txt b/src/ioslaves/remote/CMakeLists.txt --- a/src/ioslaves/remote/CMakeLists.txt +++ b/src/ioslaves/remote/CMakeLists.txt @@ -5,10 +5,14 @@ remoteimpl.cpp ) -ecm_qt_declare_logging_category(kio_remote_SRCS HEADER debug.h - IDENTIFIER KIOREMOTE_LOG - CATEGORY_NAME kf5.kio.kio_remote - DEFAULT_SEVERITY Info) +ecm_qt_declare_logging_category(kio_remote_SRCS + HEADER debug.h + IDENTIFIER KIOREMOTE_LOG + CATEGORY_NAME kf5.kio.kio_remote + DEFAULT_SEVERITY Info + DESCRIPTION "kio_remote (KIO)" + EXPORT KIO +) kcoreaddons_add_plugin(kio_remote SOURCES ${kio_remote_SRCS} diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt --- a/src/ioslaves/trash/CMakeLists.txt +++ b/src/ioslaves/trash/CMakeLists.txt @@ -18,7 +18,13 @@ endif() ########### next target ############### -ecm_qt_declare_logging_category(kio_trash_PART_DEBUG_SRCS HEADER kiotrashdebug.h IDENTIFIER KIO_TRASH CATEGORY_NAME kf5.kio.trash) +ecm_qt_declare_logging_category(kio_trash_PART_DEBUG_SRCS + HEADER kiotrashdebug.h + IDENTIFIER KIO_TRASH + CATEGORY_NAME kf5.kio.trash + DESCRIPTION "kio trash (KIO)" + EXPORT KIO +) if(WIN32) set(kio_trash_PART_SRCS kio_trash_win.cpp ${kio_trash_PART_DEBUG_SRCS}) else() diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt --- a/src/kcms/kio/CMakeLists.txt +++ b/src/kcms/kio/CMakeLists.txt @@ -29,6 +29,13 @@ kcookiesmanagement.ui kcookiespolicyselectiondlg.ui) +ecm_qt_export_logging_category( + IDENTIFIER KIO_USERAGENTDLG + CATEGORY_NAME kf5.kio.useragentdlg + DESCRIPTION "kio useragentdialog (KIO)" + EXPORT KIO +) + add_library(kcm_kio MODULE ${kcm_kio_PART_SRCS}) target_link_libraries(kcm_kio diff --git a/src/kiod/CMakeLists.txt b/src/kiod/CMakeLists.txt --- a/src/kiod/CMakeLists.txt +++ b/src/kiod/CMakeLists.txt @@ -5,6 +5,13 @@ set(kiod_SRCS ${kiod_SRCS} kiod_agent.mm) endif() +ecm_qt_export_logging_category( + IDENTIFIER KIOD_CATEGORY + CATEGORY_NAME kf5.kiod + DESCRIPTION "KIO Daemon (KIO)" + EXPORT KIO +) + add_executable(kiod5 ${kiod_SRCS}) target_link_libraries(kiod5 diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt --- a/src/kioexec/CMakeLists.txt +++ b/src/kioexec/CMakeLists.txt @@ -7,7 +7,10 @@ ecm_qt_declare_logging_category(kioexecd_SRCS HEADER kioexecdebug.h IDENTIFIER KIOEXEC - CATEGORY_NAME kf5.kio.execd) + CATEGORY_NAME kf5.kio.execd + DESCRIPTION "kioexecd (KIO)" + EXPORT KIO +) kcoreaddons_add_plugin(kioexecd SOURCES ${kioexecd_SRCS} diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt --- a/src/kpasswdserver/CMakeLists.txt +++ b/src/kpasswdserver/CMakeLists.txt @@ -19,6 +19,13 @@ qt5_add_dbus_adaptor(kiod_kpasswdserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../core/org.kde.KPasswdServer.xml kpasswdserver.h KPasswdServer) +ecm_qt_export_logging_category( + IDENTIFIER category + CATEGORY_NAME org.kde.kio.kpasswdserver + DESCRIPTION "KPasswdServer (KIO)" + EXPORT KIO +) + kcoreaddons_add_plugin(kiod_kpasswdserver INSTALL_NAMESPACE "kf5/kiod" JSON kpasswdserver.json SOURCES ${kiod_kpasswdserver_SRCS}) set_target_properties(kiod_kpasswdserver PROPERTIES OUTPUT_NAME kpasswdserver diff --git a/src/urifilters/ikws/CMakeLists.txt b/src/urifilters/ikws/CMakeLists.txt --- a/src/urifilters/ikws/CMakeLists.txt +++ b/src/urifilters/ikws/CMakeLists.txt @@ -11,6 +11,14 @@ ki18n_wrap_ui(kuriikwsfilter_SRCS ikwsopts_ui.ui searchproviderdlg_ui.ui) +ecm_qt_export_logging_category( + IDENTIFIER category + CATEGORY_NAME org.kde.kurifilter-ikws + DEFAULT_SEVERITY Warning + DESCRIPTION "KUriFilter IKWS (KIO)" + EXPORT KIO +) + kcoreaddons_add_plugin(kuriikwsfilter INSTALL_NAMESPACE "kf5/urifilters" JSON kuriikwsfilter.json SOURCES ${kuriikwsfilter_SRCS}) target_link_libraries(kuriikwsfilter diff --git a/src/urifilters/localdomain/CMakeLists.txt b/src/urifilters/localdomain/CMakeLists.txt --- a/src/urifilters/localdomain/CMakeLists.txt +++ b/src/urifilters/localdomain/CMakeLists.txt @@ -1,5 +1,13 @@ set(localdomainurifilter_SRCS localdomainurifilter.cpp ) +ecm_qt_export_logging_category( + IDENTIFIER category + CATEGORY_NAME org.kde.kurifilter-localdomain + DEFAULT_SEVERITY Warning + DESCRIPTION "KUriFilter Local Domain (KIO)" + EXPORT KIO +) + kcoreaddons_add_plugin(localdomainurifilter INSTALL_NAMESPACE "kf5/urifilters" JSON localdomainurifilter.json SOURCES ${localdomainurifilter_SRCS}) target_link_libraries(localdomainurifilter KF5::KIOWidgets) diff --git a/src/urifilters/shorturi/CMakeLists.txt b/src/urifilters/shorturi/CMakeLists.txt --- a/src/urifilters/shorturi/CMakeLists.txt +++ b/src/urifilters/shorturi/CMakeLists.txt @@ -1,5 +1,13 @@ set(kshorturifilter_SRCS kshorturifilter.cpp) +ecm_qt_export_logging_category( + IDENTIFIER category + CATEGORY_NAME org.kde.kurifilter-shorturi + DEFAULT_SEVERITY Warning + DESCRIPTION "KUriFilter Shorturi (KIO)" + EXPORT KIO +) + kcoreaddons_add_plugin(kshorturifilter INSTALL_NAMESPACE "kf5/urifilters" JSON kshorturifilter.json SERVICETYPES ${CMAKE_SOURCE_DIR}/src/widgets/kurifilterplugin.desktop SOURCES ${kshorturifilter_SRCS}) target_link_libraries(kshorturifilter KF5::I18n KF5::KIOWidgets Qt5::DBus) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -73,7 +73,20 @@ ) endif() -ecm_qt_declare_logging_category(kiowidgets_SRCS HEADER kio_widgets_debug.h IDENTIFIER KIO_WIDGETS CATEGORY_NAME kf5.kio.widgets) +ecm_qt_declare_logging_category(kiowidgets_SRCS + HEADER kio_widgets_debug.h + IDENTIFIER KIO_WIDGETS + CATEGORY_NAME kf5.kio.widgets + DESCRIPTION "KIOWidgets (KIO)" + EXPORT KIO +) + +ecm_qt_export_logging_category( + IDENTIFIER category + CATEGORY_NAME kf5.kio.kdirmodel + DESCRIPTION "KDirModel (KIO)" + EXPORT KIO +) qt5_add_dbus_adaptor(kiowidgets_SRCS org.kde.kio.FileUndoManager.xml fileundomanager_p.h KIO::FileUndoManagerPrivate fileundomanager_adaptor KIOFileUndoManagerAdaptor)