diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-03-03 14:31:46 -0800 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-03-04 09:14:38 -0800 |
| commit | a5c1327c905204b633085a6284fdbda4160f4566 (patch) | |
| tree | ec13ae40fc9d51a3f38d7f78beffe47dad4a28e9 | |
| parent | c2bb0b4911505c7a1a5a78c02d3785856f42ee99 (diff) | |
| download | qtlocation-mapboxgl-a5c1327c905204b633085a6284fdbda4160f4566.tar.gz | |
[Qt] Remove legacy QOpenGL dependency from Qt5 build
OpenGL on Qt5 is offered via QtGui.
| -rw-r--r-- | include/mbgl/gl/gl.hpp | 4 | ||||
| -rw-r--r-- | platform/qt/config.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/qt4.cmake | 5 | ||||
| -rw-r--r-- | platform/qt/qt5.cmake | 9 | ||||
| -rw-r--r-- | 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 425f78bcba..297005df9d 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 50e374174b..08bebc3afd 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 f464876dfa..5adb5a7a82 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 ${CMAKE_SOURCE_DIR}/platform/qt/include/qquickmapboxgl.hpp PRIVATE ${CMAKE_SOURCE_DIR}/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> |