Port deprecated KWindowSystem

Bump KF5 minimum version to 5.101.0. KX11Extras was introduced on that version.
lxqt · May 25, 2023 · fae2576 · fae2576
1 parent 7eaea6c
commit fae2576
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(liblxqt)
 
 
 set(LXQTBT_MINIMUM_VERSION "0.13.0")
-set(KF5_MINIMUM_VERSION "5.36.0")
+set(KF5_MINIMUM_VERSION "5.101.0")
 set(QT_MINIMUM_VERSION "5.15.0")
 set(QTXDG_MINIMUM_VERSION "3.11.0")
 

diff --git a/lxqtsingleapplication.cpp b/lxqtsingleapplication.cpp
@@ -28,6 +28,7 @@
 #include "lxqtsingleapplication.h"
 #include "singleapplicationadaptor.h"
 #include <KWindowSystem/KWindowSystem>
+#include <KWindowSystem/KX11Extras>
 #include <QDBusMessage>
 #include <QWidget>
 #include <QDebug>
@@ -95,13 +96,16 @@ void SingleApplication::activateWindow()
     if (mActivationWindow) {
         mActivationWindow->show();
         WId window = mActivationWindow->effectiveWinId();
-
         KWindowInfo info(window, KWindowSystem::WMDesktop);
         int windowDesktop = info.desktop();
 
-        if (windowDesktop != KWindowSystem::currentDesktop())
-            KWindowSystem::setCurrentDesktop(windowDesktop);
-        KWindowSystem::activateWindow(window);
+        if (windowDesktop != KX11Extras::currentDesktop())
+            KX11Extras::setCurrentDesktop(windowDesktop);
+
+        if (QWindow *w = mActivationWindow->windowHandle())
+            KWindowSystem::activateWindow(w);
+         else
+            qDebug() << Q_FUNC_INFO << "Got null windowHandle";
     } else {
         qDebug() << Q_FUNC_INFO << "activationWindow not set or null";
     }