From aa9bf7139c8d0d7cd8bc28c0a540ebbf4b47d7e2 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 7 Dec 2016 16:30:05 +0100 Subject: [qt, macos] Remove workaround for a bug in Qt 5.7 --- platform/qt/src/qmapboxgl.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'platform/qt/src') 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); -- cgit v1.2.1