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, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index e17d8ee38b..343a9384bc 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -754,7 +754,7 @@ void tst_QTimer::recurseOnTimeoutAndStopTimer()
 
 struct CountedStruct
 {
-    CountedStruct(int *count, QThread *t = Q_NULLPTR) : count(count), thread(t) { }
+    CountedStruct(int *count, QThread *t = nullptr) : count(count), thread(t) { }
     ~CountedStruct() { }
     void operator()() const { ++(*count); if (thread) QCOMPARE(QThread::currentThread(), thread); }
 
@@ -763,7 +763,7 @@ struct CountedStruct
 };
 
 static QScopedPointer<QEventLoop> _e;
-static QThread *_t = Q_NULLPTR;
+static QThread *_t = nullptr;
 
 class StaticEventLoop
 {
@@ -827,7 +827,7 @@ void tst_QTimer::singleShotToFunctors()
     _t->quit();
     _t->wait();
     _t->deleteLater();
-    _t = Q_NULLPTR;
+    _t = nullptr;
 
     {
         QObject c3;
@@ -865,7 +865,7 @@ void tst_QTimer::singleShotToFunctors()
     QCOMPARE(count, 5);
 
     _e.reset();
-    _t = Q_NULLPTR;
+    _t = nullptr;
 }
 
 void tst_QTimer::singleShot_chrono()