diff options
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/computegles31/glwindow.h | 2 | ||||
| -rw-r--r-- | examples/opengl/qopenglwindow/background_renderer.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/opengl/computegles31/glwindow.h b/examples/opengl/computegles31/glwindow.h index 877f7b732e..f243858a45 100644 --- a/examples/opengl/computegles31/glwindow.h +++ b/examples/opengl/computegles31/glwindow.h @@ -86,7 +86,7 @@ public: void setBlurRadius(float blurRadius); protected: - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; void setAnimating(bool animate); private: diff --git a/examples/opengl/qopenglwindow/background_renderer.cpp b/examples/opengl/qopenglwindow/background_renderer.cpp index d57198444e..cba4ae1f2f 100644 --- a/examples/opengl/qopenglwindow/background_renderer.cpp +++ b/examples/opengl/qopenglwindow/background_renderer.cpp @@ -146,7 +146,7 @@ void FragmentToy::draw(const QSize &windowSize) m_fragment_shader.reset(new QOpenGLShader(QOpenGLShader::Fragment)); if (!m_fragment_shader->compileSourceCode(data)) { qWarning() << "Failed to compile fragment shader:" << m_fragment_shader->log(); - m_fragment_shader.reset(Q_NULLPTR); + m_fragment_shader.reset(nullptr); } } else { qWarning() << "Unknown error, no fragment shader"; @@ -198,14 +198,14 @@ void FragmentToy::fileChanged(const QString &path) m_recompile_shaders = true; if (m_program) { m_program->removeShader(m_fragment_shader.data()); - m_fragment_shader.reset(Q_NULLPTR); + m_fragment_shader.reset(nullptr); } } } else { m_recompile_shaders = true; if (m_program) { m_program->removeShader(m_fragment_shader.data()); - m_fragment_shader.reset(Q_NULLPTR); + m_fragment_shader.reset(nullptr); } } } |