Merge pull request #160 from xzhavilla/hotfix/opengl

Remove dependency on Qt5OpenGL
mltframework · Dec 24, 2016 · 1b306a3 · 1b306a3
2 parents 81ba48b + 6ba6cab
commit 1b306a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/src/modules/qt/configure b/src/modules/qt/configure
@@ -107,14 +107,6 @@ else
 		then
 			echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtWidgets >> config.mak
 			echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5Widgets >> config.mak
-			if [ -f "$qt_libdir/libQt5OpenGL.so" ] || [ -f "$qt_libdir/libQt5OpenGL.a" ]
-			then
-				echo QTCXXFLAGS+=-I$qt_includedir/QtOpenGL >> config.mak
-				echo QTLIBS+=-lQt5OpenGL >> config.mak
-			else
-				echo "- Qt5OpenGL not found: disabling"
-				without_opengl=true
-			fi
 		# Qt5 on OS X
 		elif [ -d "$qt_libdir/QtWidgets.framework" ]
 		then
@@ -123,11 +115,10 @@ else
 				-I$qt_includedir/QtGui -I$qt_libdir/QtGui.framework/Headers \
 				-I$qt_includedir/QtXml -I$qt_libdir/QtXml.framework/Headers \
 				-I$qt_includedir/QtSvg -I$qt_libdir/QtSvg.framework/Headers \
-				-I$qt_includedir/QtOpenGL -I$qt_libdir/QtOpenGL.framework/Headers \
 				-I$qt_includedir/QtWidgets -I$qt_libdir/QtWidgets.framework/Headers \
 				>> config.mak
 			echo QTLIBS=-F"$qt_libdir" -framework QtCore -framework QtGui -framework \
-				QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
+				QtXml -framework QtSvg -framework QtWidgets >> config.mak
 		# Qt4 on OS X
 		elif [ -d "$qt_libdir/QtGui.framework" ]
 		then
@@ -151,15 +142,6 @@ else
 			without_kde=true
 			echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
 			echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
-			pkg-config --exists 'Qt5OpenGL'
-			if [ $? -eq 0 ]
-			then
-				echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak
-				echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak
-			else
-				echo "- Qt5OpenGL not found: disabling"
-				without_opengl=true
-			fi
 		else
 			pkg-config --exists 'QtGui >= 4'
 			if [ $? -eq 0 ]

diff --git a/src/modules/qt/consumer_qglsl.cpp b/src/modules/qt/consumer_qglsl.cpp
@@ -20,13 +20,14 @@
 #include "common.h"
 #include <framework/mlt.h>
 #include <QApplication>
-#include <QGLWidget>
-#include <QMutex>
-#include <QWaitCondition>
 #include <QtGlobal>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 
+#include <QGLWidget>
+#include <QMutex>
+#include <QWaitCondition>
+
 class GLWidget : public QGLWidget
 {
 private: