Git commit afc01f1c5048d294b0676403a18744dde0a53d3a by Ben Cooksley. Committed on 08/12/2017 at 09:46. Pushed by bcooksley into branch 'master'.
Revert "Autogenerate debug file" I'm backing all of this out for now as fixing this properly is non-trivial and the build is broken on at least one platform due to this change. This reverts commit 1e4bb4e9ac37ef3b38975b3ea65df4c066f5e506. CCMAIL: mon...@kde.org CCMAIL: kde-frameworks-devel@kde.org M +0 -3 CMakeLists.txt D +0 -1 baloo.categories M +1 -2 src/file/CMakeLists.txt A +24 -0 src/file/baloodebug.cpp [License: LGPL (v2+)] A +29 -0 src/file/baloodebug.h [License: LGPL (v2+)] https://commits.kde.org/baloo/afc01f1c5048d294b0676403a18744dde0a53d3a diff --git a/CMakeLists.txt b/CMakeLists.txt index a138922e..5ec72f38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMAddTests) include(ECMAddQch) -include(ECMQtDeclareLoggingCategory) option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -145,7 +144,5 @@ install(FILES COMPONENT Devel ) -install(FILES baloo.categories DESTINATION ${KDE_INSTALL_CONFDIR}) - # and we're done feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/baloo.categories b/baloo.categories deleted file mode 100644 index 5610e217..00000000 --- a/baloo.categories +++ /dev/null @@ -1 +0,0 @@ -org.kde.baloo Baloo File debug diff --git a/src/file/CMakeLists.txt b/src/file/CMakeLists.txt index de4dc85c..ca463456 100644 --- a/src/file/CMakeLists.txt +++ b/src/file/CMakeLists.txt @@ -32,6 +32,7 @@ set(file_static_lib_SRCS filtereddiriterator.cpp unindexedfileiterator.cpp migrator.cpp + baloodebug.cpp fileinfo.cpp # File Watcher @@ -42,8 +43,6 @@ set(file_static_lib_SRCS kinotify.cpp ) -ecm_qt_declare_logging_category(file_static_lib_SRCS HEADER baloodebug.h IDENTIFIER BALOO CATEGORY_NAME org.kde.baloo) - add_library(baloofilecommon STATIC ${file_static_lib_SRCS}) target_link_libraries(baloofilecommon Qt5::DBus diff --git a/src/file/baloodebug.cpp b/src/file/baloodebug.cpp new file mode 100644 index 00000000..ef36cc2b --- /dev/null +++ b/src/file/baloodebug.cpp @@ -0,0 +1,24 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Vishesh Handa <vha...@kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "baloodebug.h" + +Q_LOGGING_CATEGORY(BALOO, "org.kde.baloo") + + diff --git a/src/file/baloodebug.h b/src/file/baloodebug.h new file mode 100644 index 00000000..9e395e2a --- /dev/null +++ b/src/file/baloodebug.h @@ -0,0 +1,29 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Vishesh Handa <vha...@kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef BALOO_DEBUG_H +#define BALOO_DEBUG_H + +#include <QLoggingCategory> +#include <QDebug> + +Q_DECLARE_LOGGING_CATEGORY(BALOO) + +#endif +