Fix build failure in #764

NatronGitHub · Jan 30, 2022 · 76e631b · 76e631b
1 parent 67b3b98
commit 76e631b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Gui/Gui.pro b/Gui/Gui.pro
@@ -22,8 +22,13 @@ TEMPLATE = lib
 CONFIG += staticlib
 CONFIG += moc rcc
 CONFIG += boost opengl qt cairo python shiboken pyside 
-QT += gui core opengl network
-greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
+QT += gui core network
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += concurrent
+} else {
+    QT += opengl
+}
 
 GUI_WRAPPER_DIR = Qt$${QT_MAJOR_VERSION}/NatronGui
 ENGINE_WRAPPER_DIR = Qt$${QT_MAJOR_VERSION}/NatronEngine

diff --git a/Gui/GuiFwd.h b/Gui/GuiFwd.h
@@ -49,7 +49,6 @@ class QFont;
 class QFontComboBox;
 class QFontMetrics;
 class QFrame;
-class QOpenGLShaderProgram;
 class QGraphicsLineItem;
 class QGraphicsPolygonItem;
 class QGraphicsScene;
@@ -95,6 +94,12 @@ class QWheelEvent;
 class QWidget;
 typedef boost::shared_ptr<QUndoStack> QUndoStackPtr;
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+class QOpenGLShaderProgram;
+#else
+typedef QGLShaderProgram QOpenGLShaderProgram;
+#endif
+
 // Natron Gui
 NATRON_NAMESPACE_ENTER
 class AboutWindow;