mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-18 21:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Use winId for Wayland surface in Qt 6.9+

Browse Source 
As of Qt 6.9, winId return a wl_surface pointer which allows us to move
away completely from QPlatformNativeInterface.

https://github.com/qt/qtwayland/commit/32f9b4d
This commit is contained in:
tytan652
2025-04-18 09:59:39 +02:00
committed by Ryan Foster
parent 840ca8e0d9
commit b65ee89451
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/widgets/OBSQTDisplay.cpp
View File

@@ -10,8 +10,10 @@
#include <QWindow>
#ifdef ENABLE_WAYLAND
#include <QApplication>
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
#include <qpa/qplatformnativeinterface.h>
#endif
#endif
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
@@ -50,8 +52,12 @@ static bool QTToGSWindow(QWindow *window, gs_window &gswindow)
break;
#ifdef ENABLE_WAYLAND
case OBS_NIX_PLATFORM_WAYLAND: {
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
gswindow.display = native->nativeResourceForWindow("surface", window);
#else
gswindow.display = (void *)window->winId();
#endif
success = gswindow.display != nullptr;
break;
}