Index: CMakeLists_Dependencies.cmake =================================================================== --- CMakeLists_Dependencies.cmake (revision 27002) +++ CMakeLists_Dependencies.cmake (working copy) @@ -211,8 +211,8 @@ #>>LibXML2 #< #include #include +#include #include "DockSplitter.h" #include "DockManager.h" @@ -39,10 +40,14 @@ #include "ads_globals.h" #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) -#include -#include -#include -#include + #include + #include + #include + #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + #include + #else + #include + #endif #endif namespace ads @@ -69,12 +74,19 @@ { if (!qApp) return nullptr; + #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + if (auto *x11Application = qGuiApp->nativeInterface()) { + return x11Application->connection(); + } else { + return nullptr; + } + #else QPlatformNativeInterface *native = qApp->platformNativeInterface(); if (!native) return nullptr; - void *connection = native->nativeResourceForIntegration(QByteArray("connection")); return reinterpret_cast(connection); + #endif }