Commit 5b17c9e3 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Rebase on current master

parent b94bc90d
......@@ -19,7 +19,7 @@
#include "osd.h"
#include "utils.h"
#include "debug.h"
#include "kscreen_daemon_debug.h"
#include <KScreen/Mode>
......
......@@ -18,7 +18,7 @@
#include "osdmanager.h"
#include "osd.h"
#include "debug.h"
#include "kscreen_daemon_debug.h"
#include <KScreen/Config>
#include <KScreen/GetConfigOperation>
......@@ -61,7 +61,6 @@ OsdManager* OsdManager::self()
void OsdManager::showOutputIdentifiers()
{
qDebug() << "SHOWOUTPUTIDENTIFIERS";
connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished,
this, &OsdManager::slotIdentifyOutputs);
}
......
include_directories(${CMAKE_SOURCE_DIR}/kcm/src)
include_directories(
${CMAKE_SOURCE_DIR}/kcm/src
${CMAKE_BINARY_DIR}/kded
)
add_executable(osdtest main.cpp
osdtest.cpp
......
Supports Markdown
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