From f6cd017f58f0e31d51c7e877b43aca3fc50d1866 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Fri, 3 Mar 2017 14:31:46 -0800
Subject: [Qt] Remove legacy QOpenGL dependency from Qt5 build

OpenGL on Qt5 is offered via QtGui.
---
 include/mbgl/gl/gl.hpp                   | 4 ++--
 platform/qt/config.cmake                 | 2 +-
 platform/qt/qt4.cmake                    | 5 +++++
 platform/qt/qt5.cmake                    | 9 +++++++--
 platform/qt/test/headless_backend_qt.cpp | 3 ++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/include/mbgl/gl/gl.hpp b/include/mbgl/gl/gl.hpp
index 7521b4c80d..3a577b289b 100644
--- a/include/mbgl/gl/gl.hpp
+++ b/include/mbgl/gl/gl.hpp
@@ -22,9 +22,9 @@
     #define GL_GLEXT_PROTOTYPES
     #include <GLES2/gl2.h>
     #include <GLES2/gl2ext.h>
-#elif __QT__
+#elif __QT_ && QT_VERSION >= 0x050000
     #define GL_GLEXT_PROTOTYPES
-    #include <QtOpenGL>
+    #include <QtGui/qopengl.h>
 #else
     #define GL_GLEXT_PROTOTYPES
     #include <GL/gl.h>
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index e97c6b340a..4563f03a9b 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -72,7 +72,7 @@ macro(mbgl_platform_test)
 
     target_link_libraries(mbgl-test
         PRIVATE qmapboxgl
-        ${MBGL_QT_LIBRARIES}
+        ${MBGL_QT_TEST_LIBRARIES}
     )
 endmacro()
 
diff --git a/platform/qt/qt4.cmake b/platform/qt/qt4.cmake
index d6d7d89417..80fd4f00d3 100644
--- a/platform/qt/qt4.cmake
+++ b/platform/qt/qt4.cmake
@@ -8,6 +8,11 @@ set(MBGL_QT_LIBRARIES
     PRIVATE Qt4::QtSql
 )
 
+set(MBGL_QT_TEST_LIBRARIES
+    PRIVATE Qt4::QtCore
+    PRIVATE Qt4::QtOpenGL
+)
+
 target_link_libraries(qmapboxgl
     PRIVATE mbgl-core
     PRIVATE Qt4::QtCore
diff --git a/platform/qt/qt5.cmake b/platform/qt/qt5.cmake
index 7210a3d5f5..9a482f6d30 100644
--- a/platform/qt/qt5.cmake
+++ b/platform/qt/qt5.cmake
@@ -11,10 +11,16 @@ set(MBGL_QT_LIBRARIES
     PRIVATE Qt5::Core
     PRIVATE Qt5::Gui
     PRIVATE Qt5::Network
-    PRIVATE Qt5::OpenGL
     PRIVATE Qt5::Sql
 )
 
+set(MBGL_QT_TEST_LIBRARIES
+    PRIVATE Qt5::Core
+    PRIVATE Qt5::Gui
+    PRIVATE Qt5::Widgets
+    PRIVATE Qt5::OpenGL
+)
+
 target_sources(qmapboxgl
     PRIVATE platform/qt/include/qquickmapboxgl.hpp
     PRIVATE platform/qt/include/qquickmapboxglmapparameter.hpp
@@ -29,7 +35,6 @@ target_link_libraries(qmapboxgl
     PRIVATE Qt5::Core
     PRIVATE Qt5::Gui
     PRIVATE Qt5::Location
-    PRIVATE Qt5::OpenGL
     PRIVATE Qt5::Quick
     PRIVATE Qt5::Sql
 )
diff --git a/platform/qt/test/headless_backend_qt.cpp b/platform/qt/test/headless_backend_qt.cpp
index 00b519d5bf..401ce55a7f 100644
--- a/platform/qt/test/headless_backend_qt.cpp
+++ b/platform/qt/test/headless_backend_qt.cpp
@@ -1,10 +1,11 @@
 #include <mbgl/gl/headless_backend.hpp>
 
-#include <QGLContext>
 #include <QGLWidget>
 
 #if QT_VERSION >= 0x050000
 #include <QOpenGLContext>
+#else
+#include <QGLContext>
 #endif
 
 #include <cassert>
-- 
cgit v1.2.1