summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-12-07 16:30:05 +0100
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-12-07 17:46:09 +0100
commitaa9bf7139c8d0d7cd8bc28c0a540ebbf4b47d7e2 (patch)
tree4b880427f8f3f54f26b99030aa41371186db8d31
parent11229d72f50048a83a8f90210436052d4b1c051b (diff)
downloadqtlocation-mapboxgl-aa9bf7139c8d0d7cd8bc28c0a540ebbf4b47d7e2.tar.gz
[qt, macos] Remove workaround for a bug in Qt 5.7
-rw-r--r--platform/qt/src/qmapboxgl.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index dfd6ff58d8..5f04629831 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -800,15 +800,6 @@ void QMapboxGL::setFilter(const QString& layer_, const QVariant& filter_)
#if QT_VERSION >= 0x050000
void QMapboxGL::render(QOpenGLFramebufferObject *fbo)
{
-#if defined(__APPLE__)
- // FIXME Consume one GL_INVALID_OPERATION from Qt.
- // See https://bugreports.qt.io/browse/QTBUG-36802 for details.
- GLenum error = glGetError();
- if (!(error == GL_NO_ERROR || error == GL_INVALID_OPERATION)) {
- throw std::runtime_error(std::string("glGetError() returned ") + std::to_string(error));
- }
-#endif
-
d_ptr->dirty = false;
d_ptr->fbo = fbo;
d_ptr->mapObj->render(*d_ptr);