summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp3
-rw-r--r--src/opengl/qglfunctions.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 2c5a40a992..618f6801de 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/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);