From caea542e6de5682445dcb2387068efe1f2db3bbe Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
Date: Sat, 24 Aug 2013 19:53:05 -0700
Subject: [PATCH] Fix qglsl on Qt 5 for OS X.

---
 src/modules/qimage/configure          | 12 ++++++++----
 src/modules/qimage/consumer_qglsl.cpp |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index efd10db4..e96ada18 100755
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -84,12 +84,12 @@ else
 	if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
 	then
 		# test if we have a Qt5 or Qt4
-		if [ -f "$qimage_libdir/libQt5Core.so" ]
+		if [ -f "$qimage_libdir/libQt5Core.so" ] || [ -d "$qimage_libdir/QtWidgets.framework" ] || [ -f "$qimage_libdir/libQtCore5.a" ]
 		then
 			echo "- Qt version 5.x detected"
 			# TODO re-enable KDE support when KDE Frameworks 5 widely available
 			without_kde=true
-		elif [ -f "$qimage_libdir/libQtCore.so" ] || [ -d "$qimage_libdir/QtGui.framework" ] || [ -f "$qimage_libdir/libQtCore4.a" ] && [ "$force_qt3" = "" ]
+		elif [ -f "$qimage_libdir/libQtCore.so" ] || [ -d "$qimage_libdir/QtCore.framework" ] || [ -f "$qimage_libdir/libQtCore4.a" ]
 		then
 			echo "- Qt version 4.x detected"
 		else
@@ -100,10 +100,14 @@ else
 
 		echo "- Include directory: " $qimage_includedir
 
-		if [ -f "$qimage_libdir/libQt5Core.so" ]
+		if [ -f "$qimage_libdir/libQt5Core.so" ] || [ -f "$qimage_libdir/libQtCore5.a" ]
 		then
 			echo QTCXXFLAGS=-I$qimage_includedir -I$qimage_includedir/QtCore -I$qimage_includedir/QtGui -I$qimage_includedir/QtXml -I$qimage_includedir/QtSvg -I$qimage_includedir/QtOpenGL -I$qimage_includedir/QtWidgets >> config.mak
-			echo QTLIBS=-Wl,-rpath-link,"$qimage_includedir" -L"$qimage_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5OpenGL -lQt5Widgets >> config.mak
+			echo QTLIBS=-Wl,-rpath-link,"$qimage_libdir" -L"$qimage_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5OpenGL -lQt5Widgets >> config.mak
+		elif [ -d "$qimage_libdir/QtWidgets.framework" ]
+		then
+				echo QTCXXFLAGS=-I$qimage_includedir -I$qimage_includedir/QtCore -I$qimage_includedir/QtGui -I$qimage_includedir/QtXml -I$qimage_includedir/QtSvg -I$qimage_includedir/QtOpenGL -I$qimage_includedir/QtWidgets >> config.mak
+				echo QTLIBS=-F"$qimage_libdir" -framework QtCore -framework QtGui -framework QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
 		elif [ -d "$qimage_libdir/QtGui.framework" ]
 		then
 			echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
diff --git a/src/modules/qimage/consumer_qglsl.cpp b/src/modules/qimage/consumer_qglsl.cpp
index ed6e46a4..5a7deb78 100644
--- a/src/modules/qimage/consumer_qglsl.cpp
+++ b/src/modules/qimage/consumer_qglsl.cpp
@@ -38,7 +38,11 @@ private:
 
 public:
 	GLWidget()
+#ifdef Q_OS_MAC
+		: QGLWidget()
+#else
 		: QGLWidget(0, 0, Qt::SplashScreen)
+#endif
 		, renderContext(0)
 		, isInitialized(false)
 	{
-- 
2.39.2