qtbase(0.2.5): rebase redox.patch for Qt 6.11.1 — drop obsolete OpenGL guard hunks
Upstream Qt 6.11.1 already absorbed the #if QT_CONFIG(opengl) guards in qwaylandclientbufferintegration_p.h that our redox.patch was adding. Removed the now-obsolete hunks per patch governance (rebase, drop if upstream absorbed it). All remaining hunks apply cleanly against 6.11.1 with minor line offsets.
This commit is contained in:
@@ -496,27 +496,3 @@
|
||||
global/qgettid_p.h
|
||||
global/qglobal.cpp global/qglobal.h global/qglobal_p.h
|
||||
|
||||
--- source-old/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
|
||||
+++ source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
|
||||
@@ -52,10 +52,14 @@
|
||||
virtual bool supportsWindowDecoration() const { return false; }
|
||||
|
||||
virtual QWaylandWindow *createEglWindow(QWindow *window) = 0;
|
||||
+#if QT_CONFIG(opengl)
|
||||
virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0;
|
||||
+#endif
|
||||
virtual bool canCreatePlatformOffscreenSurface() const { return false; }
|
||||
+#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; }
|
||||
+#endif
|
||||
|
||||
enum NativeResource {
|
||||
EglDisplay,
|
||||
@@ -65,7 +69,9 @@
|
||||
};
|
||||
virtual void *nativeResource(NativeResource /*resource*/) { return nullptr; }
|
||||
+#if QT_CONFIG(opengl)
|
||||
virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; }
|
||||
+#endif
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user