gl: qt<5.3 build error. check dygl

wljcom · Feb 4, 2015 · 593908d · 593908d
1 parent 24b7447
commit 593908d
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/widgets/QOpenGLWidget.cpp b/widgets/QOpenGLWidget.cpp
@@ -21,6 +21,12 @@
 #include "QtAVWidgets/QOpenGLWidget.h"
 #include <QResizeEvent>
 #include <QWindow>
+// for dynamicgl. qglfunctions before qt5.3 does not have portable gl functions
+#ifdef QT_OPENGL_DYNAMIC
+#define DYGL(glFunc) QOpenGLContext::currentContext()->functions()->glFunc
+#else
+#define DYGL(glFunc) glFunc
+#endif
 
 namespace QtAV {
 
@@ -52,7 +58,7 @@ QOpenGLWidget::QOpenGLWidget(QWidget *parent, Qt::WindowFlags f)
     // WA_PaintOnScreen: QWidget::paintEngine: Should no longer be called.  This flag is only supported on X11 and it disables double buffering
     //setAttribute(Qt::WA_PaintOnScreen); // enforce native window, so windowHandle() is not null
     setAttribute(Qt::WA_NoSystemBackground);
-    setAutoFillBackground(true); // for compatibility
+    //setAutoFillBackground(true); // for compatibility
     // FIXME: why setSurfaceType crash?
     //windowHandle()->setSurfaceType(QWindow::OpenGLSurface);
 }
@@ -195,9 +201,8 @@ void QOpenGLWidget::render()
 
 void QOpenGLWidget::invokeUserPaint()
 {
-    QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
-    f->glViewport(0, 0, width()*devicePixelRatio(), height()*devicePixelRatio());
+    DYGL(glViewport(0, 0, width()*devicePixelRatio(), height()*devicePixelRatio()));
     paintGL();
-    f->glFlush();
+    DYGL(glFlush());
 }
 } //namespace QtAV