KDE frameworks, bump to 6.25.0 part7 (#13945)

This commit is contained in:
Schrijvers Luc
2026-04-14 17:14:49 +02:00
committed by GitHub
parent bc2655f6e3
commit 1b8d4312fd
11 changed files with 24 additions and 22 deletions

View File

@@ -0,0 +1,41 @@
From 14d741a382e514553b7d09859487e07573a4c7af Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 13 Sep 2025 11:39:22 +0200
Subject: Disable KWaylandExtras
diff --git a/src/dbusrunner.cpp b/src/dbusrunner.cpp
index 84293ec..5c62150 100644
--- a/src/dbusrunner.cpp
+++ b/src/dbusrunner.cpp
@@ -17,7 +17,9 @@
#include <QIcon>
#include <set>
+#ifndef Q_OS_HAIKU
#include <KWaylandExtras>
+#endif
#include <KWindowSystem>
#include "dbusutils_p.h"
@@ -288,6 +290,9 @@ void DBusRunner::run(const KRunner::RunnerContext & /*context*/, const KRunner::
QDBusConnection::sessionBus().call(runMethod, QDBus::NoBlock);
};
+#ifdef Q_OS_HAIKU
+ run();
+#else
if (KWindowSystem::isPlatformWayland() && qGuiApp->focusWindow()) {
auto tokenFuture = KWaylandExtras::xdgActivationToken(qGuiApp->focusWindow(), {});
tokenFuture.then(this, [this, service, matchId, actionId, run](const QString &token) {
@@ -301,6 +306,7 @@ void DBusRunner::run(const KRunner::RunnerContext & /*context*/, const KRunner::
} else {
run();
}
+#endif
}
QImage DBusRunner::decodeImage(const RemoteImage &remoteImage)
--
2.52.0