From 26088a7cbba39a4c87a42fc1e0fc75fb8a07096f Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Sun, 20 Jul 2025 20:48:07 +0200
Subject: [PATCH] Replaced depracted QX11Info by QGuiApplication

---
 retroshare-gui/src/idle/idle_platform.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/idle/idle_platform.cpp b/retroshare-gui/src/idle/idle_platform.cpp
index 71928dc59..c3d582acc 100644
--- a/retroshare-gui/src/idle/idle_platform.cpp
+++ b/retroshare-gui/src/idle/idle_platform.cpp
@@ -24,10 +24,15 @@
 #ifdef HAVE_XSS
 
 #include <qapplication.h>
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+#include <QGuiApplication>
+#else
+#include <QX11Info>
+#endif
+
 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesktopWidget>
 #endif
-#include <QX11Info>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -75,7 +80,10 @@ bool IdlePlatform::init()
 	old_handler = XSetErrorHandler(xerrhandler);
 
 	int event_base, error_base;
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+    QNativeInterface::QX11Application *nativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    if (nativeInterface && XScreenSaverQueryExtension(nativeInterface->display(), &event_base, &error_base)) {
+#elif QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 	if(QX11Info::isPlatformX11() && XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) {
 #else
 	if(XScreenSaverQueryExtension(QApplication::desktop()->screen()->x11Info().display(), &event_base, &error_base)) {
@@ -90,7 +98,10 @@ int IdlePlatform::secondsIdle()
 {
 	if(!d->ss_info)
 		return 0;
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+    QNativeInterface::QX11Application *nativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    if(!nativeInterface || !XScreenSaverQueryInfo(nativeInterface->display(), DefaultRootWindow(nativeInterface->display()), d->ss_info))
+#elif QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 	if(!QX11Info::isPlatformX11() || !XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info))
 #else
 	if(!XScreenSaverQueryInfo(QApplication::desktop()->screen()->x11Info().display(), QX11Info::appRootWindow(), d->ss_info))