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 <[email protected]>
Reviewed-by: Lars Knoll <[email protected]>
Reviewed-by: Olivier Goffart (Woboq GmbH) <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/manual/qlayout/gridwidget.cpp b/tests/manual/qlayout/gridwidget.cpp
index ede13a22c30..f19b3eac6f2 100644
--- a/tests/manual/qlayout/gridwidget.cpp
+++ b/tests/manual/qlayout/gridwidget.cpp
@@ -62,8 +62,8 @@ GridWidget::GridWidget(QWidget *parent) :
 
     qDebug("There should be four warnings, but no crash or freeze:");
     hb->addWidget(this, 6, 6); ///< This command should print a warning, but should not add "this"
-    hb->addWidget(Q_NULLPTR, 6, 7); ///< This command should print a warning, but should not add "NULL"
+    hb->addWidget(nullptr, 6, 7); ///< This command should print a warning, but should not add "NULL"
     hb->addLayout(hb, 7, 6); ///< This command should print a warning, but should not add "hb"
-    hb->addLayout(Q_NULLPTR, 7, 7); ///< This command should print a warning, but should not add "NULL"
+    hb->addLayout(nullptr, 7, 7); ///< This command should print a warning, but should not add "NULL"
     qDebug("Neither crashed nor frozen");
 }