fix: qtbase P1 patch for QPlatformOpenGLContext OpenGL guard

14-line durability patch adds #if QT_CONFIG(opengl) guards
around createEglWindow, createPlatformOpenGLContext, and
nativeResourceForContext functions that use OpenGL types.

Patch applied during source extraction (not inline Python).
This commit is contained in:
2026-04-28 13:47:54 +01:00
parent 4cf59376d5
commit 2faaf4ed46
3 changed files with 28 additions and 0 deletions
@@ -0,0 +1,26 @@
--- /tmp/qtb-orig/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h 2026-03-05 07:51:49.000000000 +0000
+++ /tmp/qtb-mod/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h 2026-04-28 13:47:16.739467291 +0100
@@ -51,9 +51,13 @@
virtual bool supportsThreadedOpenGL() const { return false; }
virtual bool supportsWindowDecoration() const { return false; }
+ #if QT_CONFIG(opengl)
+#if QT_CONFIG(opengl)
virtual QWaylandWindow *createEglWindow(QWindow *window) = 0;
virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0;
+#endif
virtual bool canCreatePlatformOffscreenSurface() const { return false; }
+#endif
#if QT_CONFIG(opengl)
virtual QOpenGLContext *createOpenGLContext(EGLContext context, EGLDisplay contextDisplay, QOpenGLContext *shareContext) const = 0;
virtual QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const { Q_UNUSED(surface); return nullptr; }
@@ -65,7 +69,9 @@
EglContext
};
virtual void *nativeResource(NativeResource /*resource*/) { return nullptr; }
+#if QT_CONFIG(opengl)
virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; }
+#endif
};
}
+1
View File
@@ -0,0 +1 @@
../../../../local/patches/qtbase/P1-qplatformopengl-guard.patch
+1
View File
@@ -7,6 +7,7 @@ tar = "https://download.qt.io/official_releases/qt/6.11/6.11.0/submodules/qtbase
patches = [ patches = [
"redox.patch", "redox.patch",
"../../../../local/patches/qtbase/P0-remove-redox-linkat-unlinkat-stubs.patch", "../../../../local/patches/qtbase/P0-remove-redox-linkat-unlinkat-stubs.patch",
"P1-qplatformopengl-guard.patch",
] ]
[build] [build]