Changeset 84800 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 11, 2020 3:36:31 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: experimental QOpenGLWidget (disabled): reorder headers. bugref:9695

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -63 +63 @@
 #ifdef VBOX_GUI_WITH_QTGLFRAMEBUFFER
 /* Experimental code. */
-# ifdef RT_OS_LINUX
-#include <GL/glx.h>
-# endif
 
 /* Qt OpenGL includes: */
@@ -76 +73 @@
 #include <QOpenGLTexture>
 #include <QOpenGLWidget>
+
+# ifdef RT_OS_LINUX
+/* GL/glx.h must be included after Qt GL headers (which define GL_GLEXT_LEGACY) to avoid GL_GLEXT_VERSION conflict. */
+#include <GL/glx.h>
+# endif
 
 class UIFrameBufferPrivate;