From c61203d087e034639f57c9f0a0d6d7697d1874fe Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Sun, 31 Jul 2016 01:34:58 +0300
Subject: [Qt] Test with qtopengl.h

---
 include/mbgl/gl/gl.hpp |  3 +++
 platform/qt/qt.cmake   | 10 ----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/include/mbgl/gl/gl.hpp b/include/mbgl/gl/gl.hpp
index 285f1ff3ba..32a26b3f56 100644
--- a/include/mbgl/gl/gl.hpp
+++ b/include/mbgl/gl/gl.hpp
@@ -24,6 +24,9 @@
     #else
         #error Unsupported Apple platform
     #endif
+#elif __QT__
+    #define GL_GLEXT_PROTOTYPES
+    #include <qopengl.h>
 #elif __ANDROID__ || MBGL_USE_GLES2
     #define GL_GLEXT_PROTOTYPES
     #include <GLES2/gl2.h>
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index ef489d1fed..ca637ad72b 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -29,10 +29,6 @@ set(MBGL_QT_FILES
     # Misc
     PRIVATE ${CMAKE_SOURCE_DIR}/platform/default/log_stderr.cpp
 
-    # Headless headless_view_cgl
-    PRIVATE ${CMAKE_SOURCE_DIR}/platform/default/headless_display.cpp
-    PRIVATE ${CMAKE_SOURCE_DIR}/platform/default/headless_view.cpp
-
     # Platform integration
     PRIVATE ${CMAKE_SOURCE_DIR}/platform/qt/src/async_task.cpp
     PRIVATE ${CMAKE_SOURCE_DIR}/platform/qt/src/async_task_impl.hpp
@@ -80,7 +76,6 @@ endif()
 if (BUILD_PLATFORM STREQUAL "macos")
     list(APPEND MBGL_QT_FILES
         PRIVATE ${CMAKE_SOURCE_DIR}/platform/darwin/src/nsthread.mm
-        PRIVATE ${CMAKE_SOURCE_DIR}/platform/darwin/src/headless_view_cgl.cpp
     )
     list(APPEND MBGL_QT_LIBRARIES
         PRIVATE "-framework Foundation"
@@ -89,10 +84,5 @@ if (BUILD_PLATFORM STREQUAL "macos")
 else()
     list(APPEND MBGL_QT_FILES
         PRIVATE ${CMAKE_SOURCE_DIR}/platform/default/thread.cpp
-        PRIVATE ${CMAKE_SOURCE_DIR}/platform/default/headless_view_glx.cpp
-    )
-    list(APPEND MBGL_QT_LIBRARIES
-        PRIVATE -lGL
-        PRIVATE -lX11
     )
 endif()
-- 
cgit v1.2.1