From 0ab41802f4020b823c379668ac83c81cd7f7dbf6 Mon Sep 17 00:00:00 2001
From: Kevin Ottens <kevin.ottens@enioka.com>
Date: Wed, 10 Mar 2021 11:53:04 +0100
Subject: [PATCH] Avoid KWin starting kactivitymanagerd synchronously

Prevent KWin from synchronously autostarting kactivitymanagerd. Indeed,
kactivitymanagerd being a QApplication it will depend on KWin
startup... this is unsatisfactory dependency wise, and it turns out
that it leads to a deadlock in the Wayland case
---
 src/main.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 10590a9283..48763cf1f0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -128,6 +128,12 @@ bool Application::shouldUseWaylandForCompositing() const
 
 void Application::start()
 {
+    // Prevent KWin from synchronously autostarting kactivitymanagerd
+    // Indeed, kactivitymanagerd being a QApplication it will depend
+    // on KWin startup... this is unsatisfactory dependency wise,
+    // and it turns out that it leads to a deadlock in the Wayland case
+    setProperty("org.kde.KActivities.core.disableAutostart", true);
+
     setQuitOnLastWindowClosed(false);
 
     if (!m_config) {