Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 0f328f26 authored by Laurent Montel's avatar Laurent Montel

Autogenerate debug categories + create categories file

parent 66a0c467
......@@ -38,16 +38,6 @@ set_package_properties(XCB PROPERTIES
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)")
# library setup
add_definitions(
-DQT_USE_QSTRINGBUILDER
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_ASCII
-DQT_STRICT_ITERATORS
-DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_BYTEARRAY
)
set(KF5_VERSION ${PROJECT_VERSION}) #When we are happy with the api, we can sync with frameworks
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSCREEN
......@@ -109,5 +99,7 @@ install(FILES
DESTINATION "${KF5_INCLUDE_INSTALL_DIR}"
COMPONENT Devel
)
install( FILES kscreen.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
org.kde.kscreen kscreen IDENTIFIER [KSCREEN]
org.kde.kscreen.edid kscreen (edid) IDENTIFIER [KSCREEN_EDID]
org.kde.kscreen.backendLauncher kscreen (backendlauncher) IDENTIFIER [KSCREEN_BACKEND_LAUNCHER]
......@@ -15,12 +15,24 @@ set(libkscreen_SRCS
output.cpp
edid.cpp
mode.cpp
debug_p.cpp
log.cpp
)
qt5_add_dbus_interface(libkscreen_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde.KScreen.Backend.xml backendinterface)
ecm_qt_declare_logging_category(libkscreen_SRCS
HEADER kscreen_debug.h
IDENTIFIER KSCREEN
CATEGORY_NAME org.kde.kscreen
)
ecm_qt_declare_logging_category(libkscreen_SRCS
HEADER kscreen_debug_edid.h
IDENTIFIER KSCREEN_EDID
CATEGORY_NAME org.kde.kscreen.edid
)
add_library(KF5Screen SHARED ${libkscreen_SRCS})
generate_export_header(KF5Screen BASE_NAME KScreen)
......
......@@ -10,9 +10,9 @@ set(backendlauncher_SRCS
)
ecm_qt_declare_logging_category(backendlauncher_SRCS
HEADER debug_p.h
HEADER kscreen_backendLauncher_debug.h
IDENTIFIER KSCREEN_BACKEND_LAUNCHER
CATEGORY_NAME kscreen.backendLauncher
CATEGORY_NAME org.kde.kscreen.backendLauncher
)
qt5_add_dbus_adaptor(backendlauncher_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde.KScreen.Backend.xml
......
......@@ -20,7 +20,7 @@
#include "backenddbuswrapper.h"
#include "backendloader.h"
#include "backendadaptor.h"
#include "debug_p.h"
#include "kscreen_backendLauncher_debug.h"
#include "src/configserializer_p.h"
#include "src/config.h"
......
......@@ -20,7 +20,7 @@
#include "backendloader.h"
#include "backendloaderadaptor.h"
#include "backenddbuswrapper.h"
#include "debug_p.h"
#include "kscreen_backendLauncher_debug.h"
#include "src/abstractbackend.h"
#include "src/backendmanager_p.h"
......
......@@ -20,7 +20,7 @@
#include <QGuiApplication>
#include <QDBusConnection>
#include "debug_p.h"
#include "kscreen_backendLauncher_debug.h"
#include "backendloader.h"
#include "log.h"
......
......@@ -25,7 +25,7 @@
#include "config.h"
#include "configmonitor.h"
#include "backendinterface.h"
#include "debug_p.h"
#include "kscreen_debug.h"
#include "getconfigoperation.h"
#include "configserializer_p.h"
#include "log.h"
......
......@@ -21,7 +21,7 @@
#include "output.h"
#include "backendmanager_p.h"
#include "abstractbackend.h"
#include "debug_p.h"
#include "kscreen_debug.h"
#include <QDebug>
#include <QRect>
......
......@@ -22,7 +22,7 @@
#include "abstractbackend.h"
#include "configserializer_p.h"
#include "getconfigoperation.h"
#include "debug_p.h"
#include "kscreen_debug.h"
#include "output.h"
#include <QDBusPendingCallWatcher>
......
......@@ -22,7 +22,7 @@
#include "configoperation_p.h"
#include "backendmanager_p.h"
#include "debug_p.h"
#include "kscreen_debug.h"
using namespace KScreen;
......
......@@ -24,7 +24,7 @@
#include "output.h"
#include "screen.h"
#include "edid.h"
#include "debug_p.h"
#include "kscreen_debug.h"
#include <QDBusArgument>
#include <QJsonDocument>
......
/*************************************************************************************
* Copyright (C) 2014 by Alejandro Fiestas Olivares <afiestas@kde.org> *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 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 *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
*************************************************************************************/
#include "debug_p.h"
#include <QString>
#include <QCoreApplication>
Q_LOGGING_CATEGORY(KSCREEN, "kscreen")
Q_LOGGING_CATEGORY(KSCREEN_EDID, "kscreen.edid")
/*************************************************************************************
* Copyright (C) 2014 by Alejandro Fiestas Olivares <afiestas@kde.org> *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 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 *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
*************************************************************************************/
#ifndef SCREEN_DEBUG_P_H
#define SCREEN_DEBUG_P_H
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(KSCREEN)
Q_DECLARE_LOGGING_CATEGORY(KSCREEN_EDID)
#endif //SCREEN_DEBUG_P_H
......@@ -18,7 +18,7 @@
*************************************************************************************/
#include "edid.h"
#include "debug_p.h"
#include "kscreen_debug_edid.h"
#include <math.h>
......
......@@ -22,7 +22,7 @@
#include "edid.h"
#include "abstractbackend.h"
#include "backendmanager_p.h"
#include "debug_p.h"
#include "kscreen_debug.h"
#include <QStringList>
#include <QScopedPointer>
......
......@@ -24,7 +24,7 @@
#include "configoperation_p.h"
#include "config.h"
#include "configserializer_p.h"
#include "debug_p.h"
#include "kscreen_debug.h"
#include "output.h"
#include <QDBusPendingCallWatcher>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment