diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt
index 0f7c29ea4..7e79076e1 100644
--- a/kuiserver/CMakeLists.txt
+++ b/kuiserver/CMakeLists.txt
@@ -1,78 +1,81 @@
add_definitions(-DTRANSLATION_DOMAIN=\"kuiserver5\")
add_subdirectory( tests )
set(kuiserver_KDEINIT_SRCS
main.cpp
uiserver.cpp
jobview.cpp
progresslistmodel.cpp
progresslistdelegate.cpp
requestviewcallwatcher.cpp
)
set(kuiserver_KDEINIT_PRIVATE
progresslistdelegate_p.h
uiserver_p.h
)
ki18n_wrap_ui(kuiserver_KDEINIT_SRCS configdialog.ui)
#
#
set(jobview_xml org.kde.JobView.xml)
qt5_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview.h JobView jobviewadaptor )
qt5_add_dbus_interface(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview_interface )
#
#
set(jobviewserver_xml ${KJOBWIDGETS_DBUS_INTERFACES_DIR}/kf5_org.kde.JobViewServer.xml)
qt5_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobviewserver_xml} progresslistmodel.h ProgressListModel jobviewserveradaptor )
qt5_add_dbus_interface(kuiserver_KDEINIT_SRCS ${jobviewserver_xml} jobviewserver_interface )
#
qt5_add_dbus_adaptor(kuiserver_KDEINIT_SRCS org.kde.kuiserver.xml progresslistmodel.h ProgressListModel kuiserveradaptor )
configure_file(org.kde.kuiserver.service.in
${CMAKE_CURRENT_BINARY_DIR}/org.kde.kuiserver.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kuiserver.service
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} RENAME kf5_org.kde.kuiserver.service)
#
kconfig_add_kcfg_files(kuiserver_KDEINIT_SRCS kuiserversettings.kcfgc)
kf5_add_kdeinit_executable( kuiserver5 ${kuiserver_KDEINIT_SRCS})
if (Q_WS_MAC)
set_target_properties(kuiserver5 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)
set_target_properties(kuiserver5 PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.kuiserver")
set_target_properties(kuiserver5 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE UI Server")
endif ()
target_link_libraries(kdeinit_kuiserver5
Qt5::DBus
KF5::ConfigWidgets
KF5::DBusAddons
KF5::ItemViews
KF5::Notifications
KF5::KIOCore
KF5::KIOWidgets
KF5::XmlGui
KF5::I18n
)
install(TARGETS kdeinit_kuiserver5 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
target_link_libraries( kuiserver5 kdeinit_kuiserver5 )
install(TARGETS kuiserver5 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES kuiserver.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+
+# contains list of debug categories, for kdebugsettings
+install(FILES kuiserver.categories DESTINATION ${KDE_INSTALL_CONFDIR})
diff --git a/kuiserver/kuiserver.categories b/kuiserver/kuiserver.categories
new file mode 100644
index 000000000..4d42ce1e1
--- /dev/null
+++ b/kuiserver/kuiserver.categories
@@ -0,0 +1,3 @@
+# Logging categories (for kdebugsettings)
+kuiserver KUIServer
+
diff --git a/kuiserver/main.cpp b/kuiserver/main.cpp
index 2bf0564e7..2d8a5b6f8 100644
--- a/kuiserver/main.cpp
+++ b/kuiserver/main.cpp
@@ -1,48 +1,48 @@
/*
* This file is part of the KDE project
* Copyright (C) 2009 Shaun Reich
* Copyright (C) 2006-2008 Rafael Fernández López
* Copyright (C) 2001 George Staikos
* Copyright (C) 2000 Matej Koss
* David Faure
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License version 2 as published by the Free Software Foundation.
*
* 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 "uiserver.h"
#include "uiserver_p.h"
#include "progresslistmodel.h"
#include
#include
-Q_LOGGING_CATEGORY(KUISERVER, "kuiserver")
+Q_LOGGING_CATEGORY(KUISERVER, "kuiserver", QtInfoMsg)
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
{
QApplication app(argc, argv);
app.setApplicationName(QStringLiteral("kuiserver"));
app.setApplicationVersion(QStringLiteral("2.0"));
app.setOrganizationDomain(QStringLiteral("kde.org"));
QCommandLineParser parser;
parser.addHelpOption();
parser.addVersionOption();
ProgressListModel model;
KDBusService service(KDBusService::Unique);
return app.exec();
}