From 6f4fdce07fa2e75e09dcc90a76ea6d741fb58e74 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 10 Jun 2020 08:09:41 +0200 Subject: Rename setPersistentOpenGLContext and revise related docs These persistent hints are still taken into account by the threaded render loop, so keep them, but get rid of "OpenGL Context" from the function names. The qquickwindow autotest has been updated accordingly, and with a few OpenGL-related cleanups it now runs without any warnings or skips with OpenGL-on-RHI, while it skips only 1 case when running with some other API, and 2 with the software backend. [ChangeLog][Qt Quick][QQuickWindow] The setPersistentOpenGLContext() and isPersistentOpenGLContext() functions are renamed to setPersistentGraphics() and isPersistentGraphics(). Change-Id: Ifc4cc7c4b94fe9f7e402b39ca4f28952dcafd588 Reviewed-by: Andy Nichols --- src/quick/items/qquickwindow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquickwindow.h') diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index f701cd1deb..28ff08786a 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -170,10 +170,10 @@ public: static bool hasDefaultAlphaBuffer(); static void setDefaultAlphaBuffer(bool useAlpha); - void setPersistentOpenGLContext(bool persistent); // ### Qt 6 is this relevant / usable anymore? - bool isPersistentOpenGLContext() const; + void setPersistentGraphics(bool persistent); + bool isPersistentGraphics() const; - void setPersistentSceneGraph(bool persistent); // ### Qt 6 is this relevant / usable anymore? + void setPersistentSceneGraph(bool persistent); bool isPersistentSceneGraph() const; QOpenGLContext *openglContext() const; // ### Qt 6 consider if this is kept or not -- cgit v1.2.3