File 0001-Use-platform-detection-from-KWorkspace-in-Powerdevil.patch of Package powerdevil5
From 381c7bd212fb4b0ea0afd0c8bc0e7e92319c6b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org>
Date: Sun, 18 Mar 2018 09:55:05 +0100
Subject: [PATCH] Use platform detection from KWorkspace in Powerdevil
Summary: On a wayland session powerdevil needs to use Wayland platform.
Test Plan:
Only compile tested, changes are identical to the tested
systemsettings patch.
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D11446
---
CMakeLists.txt | 2 ++
daemon/CMakeLists.txt | 1 +
daemon/powerdevilapp.cpp | 3 +++
3 files changed, 6 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c239067..20a11ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,8 @@ add_feature_info(
"Support turning off signal-transmitting devices to save energy"
)
+find_package(LibKWorkspace ${PROJECT_VERSION} REQUIRED)
+
find_package(UDev REQUIRED)
find_package(XCB REQUIRED COMPONENTS XCB RANDR DPMS)
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index fcc9c07..828f284 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -124,6 +124,7 @@ target_link_libraries(powerdevil
KF5::CoreAddons
KF5::I18n
KF5::DBusAddons
+ PW::KWorkspace
powerdevilcore
)
if (XCB_FOUND)
diff --git a/daemon/powerdevilapp.cpp b/daemon/powerdevilapp.cpp
index 0737b22..2d292b7 100644
--- a/daemon/powerdevilapp.cpp
+++ b/daemon/powerdevilapp.cpp
@@ -42,6 +42,8 @@
#include <KConfigGroup>
#include <KGlobalAccel>
+#include <kworkspace.h>
+
PowerDevilApp::PowerDevilApp(int &argc, char **argv)
: QGuiApplication(argc, argv)
, m_core(Q_NULLPTR)
@@ -195,6 +197,7 @@ void PowerDevilApp::migratePre512KeyboardShortcuts()
int main(int argc, char **argv)
{
QGuiApplication::setDesktopSettingsAware(false);
+ KWorkSpace::detectPlatform(argc, argv);
PowerDevilApp app(argc, argv);
KDBusService service(KDBusService::Unique);
--
2.16.2