Protected call to glXChooseFBConfig with appropriate defines.

Reviewed-by: Trond

1 files changed, 11 insertions, 0 deletions

diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 9c1f5372e5..8194c5881e 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -657,6 +657,11 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
 
     d->cx = 0;
 
+#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX)
+    /*
+      HPUX defines GLX_VERSION_1_3 but does not implement the corresponding functions.
+      Specifically glXChooseFBConfig and glXGetVisualFromFBConfig are not implemented.
+     */
     if ((major == 3 && minor >= 2) || major > 3) {
         QGLTemporaryContext *tmpContext = 0;
         if (!QGLContext::currentContext())
@@ -696,6 +701,12 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
         if (tmpContext)
             delete tmpContext;
     }
+#else
+    Q_UNUSED(major);
+    Q_UNUSED(minor);
+    Q_UNUSED(profile);
+#endif
+
     if (!d->cx && shareContext) {
         d->cx = glXCreateContext(disp, (XVisualInfo *)d->vi,
                                (GLXContext)shareContext->d_func()->cx, direct);