diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/gui/opengl/qopenglframebufferobject_p.h | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/gui/opengl/qopenglframebufferobject_p.h')
-rw-r--r-- | src/gui/opengl/qopenglframebufferobject_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject_p.h b/src/gui/opengl/qopenglframebufferobject_p.h index 778a38b823..644bb6c59b 100644 --- a/src/gui/opengl/qopenglframebufferobject_p.h +++ b/src/gui/opengl/qopenglframebufferobject_p.h @@ -109,8 +109,8 @@ public: class QOpenGLFramebufferObjectPrivate { public: - QOpenGLFramebufferObjectPrivate() : fbo_guard(0), depth_buffer_guard(0) - , stencil_buffer_guard(0) + QOpenGLFramebufferObjectPrivate() : fbo_guard(nullptr), depth_buffer_guard(nullptr) + , stencil_buffer_guard(nullptr) , valid(false) {} ~QOpenGLFramebufferObjectPrivate() {} @@ -135,9 +135,9 @@ public: QOpenGLExtensions funcs; struct ColorAttachment { - ColorAttachment() : internalFormat(0), guard(0) { } + ColorAttachment() : internalFormat(0), guard(nullptr) { } ColorAttachment(const QSize &size, GLenum internalFormat) - : size(size), internalFormat(internalFormat), guard(0) { } + : size(size), internalFormat(internalFormat), guard(nullptr) { } QSize size; GLenum internalFormat; QOpenGLSharedResourceGuard *guard; |