diff options
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 3 | ||||
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qglfunctions.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 2d7b0280d8..4108b70094 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -83,7 +83,8 @@ QT_BEGIN_NAMESPACE class QGLDefaultExtensions { public: - QGLDefaultExtensions() : extensions(0) { + QGLDefaultExtensions() + { QGLTemporaryContext tempContext; Q_ASSERT(QOpenGLContext::currentContext()); QOpenGLExtensions *ext = qgl_extensions(); diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index d0f82a85fa..362b3ef189 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -1395,7 +1395,7 @@ bool QGLFramebufferObject::hasOpenGLFramebufferBlit() Blits from the \a sourceRect rectangle in the \a source framebuffer object to the \a targetRect rectangle in the \a target framebuffer object. - If \a source or \a target is 0, the default framebuffer will be used + If \a source or \a target is \nullptr, the default framebuffer will be used instead of a framebuffer object as source or target respectively. The \a buffers parameter should be a mask consisting of any combination of diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp index f22f9f470b..b20311bec4 100644 --- a/src/opengl/qglfunctions.cpp +++ b/src/opengl/qglfunctions.cpp @@ -279,7 +279,7 @@ QGLFunctions::OpenGLFeatures QGLFunctions::openGLFeatures() const { QGLFunctionsPrivateEx *d = static_cast<QGLFunctionsPrivateEx *>(d_ptr); if (!d) - return 0; + return { }; if (d->m_features == -1) d->m_features = qt_gl_resolve_features(); return QGLFunctions::OpenGLFeatures(d->m_features); |