Replace Q_NULLPTR with nullptr where possible

Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
  (definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 3 insertions, 3 deletions

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);
         }
     }
 }