Changeset 94137 in vbox for trunk/include/VBox

Timestamp:

Mar 8, 2022 10:10:28 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150386

Message:

OpenGLTest: qt6 adjustments. bugref:9898

File:

• trunk/include/VBox/VBoxGL2D.h (modified) (5 diffs)

trunk/include/VBox/VBoxGL2D.h

@@ -237 +237 @@
 extern PFNVBOXVHWA_FRAMEBUFFER_TEXTURE3D vboxglFramebufferTexture3D;
 extern PFNVBOXVHWA_GET_FRAMEBUFFER_ATTACHMENT_PARAMETRIV vboxglGetFramebufferAttachmentParameteriv;
+
+
+/*
+ * Glossing over qt 5 vs 6 differences.
+ *
+ * Note! We could use the qt6 classes in 5, but we probably don't have the
+ *       necessary modules in our current qt builds.
+ */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+class QOpenGLWidget;
+class QOpenGLContext;
+# define MY_QOpenGLWidget   QOpenGLWidget
+# define MY_QOpenGLContext  QOpenGLContext
+#else
+class QGLWidget;
+class QGLContext;
+# define MY_QOpenGLWidget   QGLWidget
+# define MY_QOpenGLContext  QGLContext
+#endif
 
 
@@ -262 +281 @@
     {}
 
-    void init(const class QGLContext * pContext);
+    void init(const MY_QOpenGLContext *pContext);
 
     bool isInitialized() const { return mInitialized; }
@@ -280 +299 @@
     static int parseVersion(const GLubyte * ver);
 private:
-    void initExtSupport(const class QGLContext & context);
+    void initExtSupport(const MY_QOpenGLContext &context);
 
     int mGLVersion;
@@ -309 +328 @@
     ~VBoxGLTmpContext();
 
-    const class QGLContext * makeCurrent();
+    const MY_QOpenGLContext *makeCurrent();
 private:
-    class QGLWidget * mWidget;
+    MY_QOpenGLWidget *mWidget;
 };
 
@@ -339 +358 @@
     {}
 
-    void init(const class QGLContext * pContext);
+    void init(const MY_QOpenGLContext *pContext);
 
     bool isInitialized() const { return mInitialized; }