Commit 7e2c616f authored by David Faure's avatar David Faure

Merge branch 'Plasma/5.10'

parents bbdcf72a c67769e0
......@@ -76,3 +76,6 @@ 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})
# Logging categories (for kdebugsettings)
kuiserver KUIServer
......@@ -29,7 +29,7 @@
#include <QCommandLineParser>
Q_LOGGING_CATEGORY(KUISERVER, "kuiserver")
Q_LOGGING_CATEGORY(KUISERVER, "kuiserver", QtInfoMsg)
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
{
......
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