]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Autogenerate debug file + install debug categories file
authorLaurent Montel <montel@kde.org>
Fri, 2 Nov 2018 12:23:10 +0000 (13:23 +0100)
committerLaurent Montel <montel@kde.org>
Fri, 2 Nov 2018 12:23:10 +0000 (13:23 +0100)
CMakeLists.txt
dolphin.categories [new file with mode: 0644]
src/CMakeLists.txt
src/dolphindebug.cpp [deleted file]
src/dolphindebug.h [deleted file]

index 390376e944c03460cebd1155f6e89baa3409da1e..27f2de82ec0ed1562544d1f488a606b173a80f02 100644 (file)
@@ -22,6 +22,7 @@ include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(ECMQtDeclareLoggingCategory)
 
 ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
 
 ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
@@ -132,5 +133,7 @@ configure_file(org.kde.dolphin.FileManager1.service.in
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 
+install( FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+
 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
new file mode 100644 (file)
index 0000000..8faeb20
--- /dev/null
@@ -0,0 +1 @@
+org.kde.dolphin dolphin IDENTIFIER [DolphinDebug]
index 5aff4b0fadcac1912962e20146ce6532cce7b1e7..4a1f173d8ef347935cf17ca068262388b77ffb9d 100644 (file)
@@ -106,9 +106,10 @@ set(dolphinprivate_LIB_SRCS
     dolphinremoveaction.cpp
     middleclickactioneventfilter.cpp
     dolphinnewfilemenu.cpp
     dolphinremoveaction.cpp
     middleclickactioneventfilter.cpp
     dolphinnewfilemenu.cpp
-    dolphindebug.cpp
 )
 
 )
 
+ecm_qt_declare_logging_category(dolphinprivate_LIB_SRCS HEADER dolphindebug.h IDENTIFIER DolphinDebug CATEGORY_NAME org.kde.dolphin)
+
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}
diff --git a/src/dolphindebug.cpp b/src/dolphindebug.cpp
deleted file mode 100644 (file)
index 17f1084..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2015 by Emmanuel Pescosta <emmanuelpescosta099@gmail.com> *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
-
-#include "dolphindebug.h"
-
-Q_LOGGING_CATEGORY(DolphinDebug, "org.kde.dolphin")
diff --git a/src/dolphindebug.h b/src/dolphindebug.h
deleted file mode 100644 (file)
index 9b4554b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2015 by Emmanuel Pescosta <emmanuelpescosta099@gmail.com> *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
-
-#ifndef DOLPHIN_DEBUG_H
-#define DOLPHIN_DEBUG_H
-
-#include <QLoggingCategory>
-
-Q_DECLARE_LOGGING_CATEGORY(DolphinDebug)
-
-#endif // DOLPHIN_DEBUG_H