Replace Q_NULLPTR with nullptr

Change-Id: I0c01862dbb475494c84e39c695cb563df8cbcfa8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

20 files changed, 82 insertions, 82 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 5b7a7f9050..3fff29bce0 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -2628,7 +2628,7 @@ bool Codegen::visit(ReturnStatement *ast)
 
     // Since we're leaving, don't let any finally statements we emit as part of the unwinding
     // jump to exception handlers at run-time if they throw.
-    IR::BasicBlock *unwindBlock = _function->newBasicBlock(/*no exception handler*/Q_NULLPTR);
+    IR::BasicBlock *unwindBlock = _function->newBasicBlock(/*no exception handler*/nullptr);
     _block->JUMP(unwindBlock);
     _block = unwindBlock;
 
diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h
index 41c4b81270..f92a26445f 100644
--- a/src/qml/jsapi/qjsengine.h
+++ b/src/qml/jsapi/qjsengine.h
@@ -119,7 +119,7 @@ private:
     friend inline bool qjsvalue_cast_helper(const QJSValue &, int, void *);
 
 protected:
-    QJSEngine(QJSEnginePrivate &dd, QObject *parent = Q_NULLPTR);
+    QJSEngine(QJSEnginePrivate &dd, QObject *parent = nullptr);
 
 private:
     QV8Engine *d;
diff --git a/src/qml/jsruntime/qv4identifier.cpp b/src/qml/jsruntime/qv4identifier.cpp
index 6260fd0cc8..e35f72b820 100644
--- a/src/qml/jsruntime/qv4identifier.cpp
+++ b/src/qml/jsruntime/qv4identifier.cpp
@@ -152,7 +152,7 @@ const IdentifierHashEntry *IdentifierHashBase::lookup(const QString &str) const
         return 0;
     Q_ASSERT(d->entries);
 
-    uint hash = String::createHashValue(str.constData(), str.length(), Q_NULLPTR);
+    uint hash = String::createHashValue(str.constData(), str.length(), nullptr);
     uint idx = hash % d->alloc;
     while (1) {
         if (!d->entries[idx].identifier)
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 50cecb6598..17d0c32853 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -601,7 +601,7 @@ struct Q_QML_PRIVATE_EXPORT Primitive : public Value
 inline Primitive Primitive::undefinedValue()
 {
     Primitive v;
-    v.setM(Q_NULLPTR);
+    v.setM(nullptr);
     return v;
 }
 
diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h
index 9ee50ec931..956805d696 100644
--- a/src/qml/qml/ftw/qhashedstring_p.h
+++ b/src/qml/qml/ftw/qhashedstring_p.h
@@ -1311,12 +1311,12 @@ bool QHashedString::compare(const char *lhs, const char *rhs, int length)
 
 quint32 QHashedString::stringHash(const QChar *data, int length)
 {
-    return QV4::String::createHashValue(data, length, Q_NULLPTR);
+    return QV4::String::createHashValue(data, length, nullptr);
 }
 
 quint32 QHashedString::stringHash(const char *data, int length)
 {
-    return QV4::String::createHashValue(data, length, Q_NULLPTR);
+    return QV4::String::createHashValue(data, length, nullptr);
 }
 
 void QHashedString::computeHash() const
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index ddb4af0b81..219df264be 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -112,10 +112,10 @@ int qmlRegisterType()
         qRegisterNormalizedMetaType<T *>(pointerName.constData()),
         qRegisterNormalizedMetaType<QQmlListProperty<T> >(listName.constData()),
         0,
-        Q_NULLPTR,
+        nullptr,
         QString(),
 
-        Q_NULLPTR, 0, 0, Q_NULLPTR, &T::staticMetaObject,
+        nullptr, 0, 0, nullptr, &T::staticMetaObject,
 
         QQmlPrivate::attachedPropertiesFunc<T>(),
         QQmlPrivate::attachedPropertiesMetaObject<T>(),
@@ -124,9 +124,9 @@ int qmlRegisterType()
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
@@ -146,7 +146,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         qRegisterNormalizedMetaType<T *>(pointerName.constData()),
         qRegisterNormalizedMetaType<QQmlListProperty<T> >(listName.constData()),
         0,
-        Q_NULLPTR,
+        nullptr,
         reason,
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
@@ -158,9 +158,9 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
@@ -178,7 +178,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         qRegisterNormalizedMetaType<T *>(pointerName.constData()),
         qRegisterNormalizedMetaType<QQmlListProperty<T> >(listName.constData()),
         0,
-        Q_NULLPTR,
+        nullptr,
         reason,
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
@@ -190,9 +190,9 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         metaObjectRevision
     };
 
@@ -217,7 +217,7 @@ int qmlRegisterExtendedUncreatableType(const char *uri, int versionMajor, int ve
         qRegisterNormalizedMetaType<T *>(pointerName.constData()),
         qRegisterNormalizedMetaType<QQmlListProperty<T> >(listName.constData()),
         0,
-        Q_NULLPTR,
+        nullptr,
         reason,
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
@@ -231,7 +231,7 @@ int qmlRegisterExtendedUncreatableType(const char *uri, int versionMajor, int ve
 
         QQmlPrivate::createParent<E>, &E::staticMetaObject,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
@@ -256,7 +256,7 @@ int qmlRegisterExtendedUncreatableType(const char *uri, int versionMajor, int ve
         qRegisterNormalizedMetaType<T *>(pointerName.constData()),
         qRegisterNormalizedMetaType<QQmlListProperty<T> >(listName.constData()),
         0,
-        Q_NULLPTR,
+        nullptr,
         reason,
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
@@ -270,7 +270,7 @@ int qmlRegisterExtendedUncreatableType(const char *uri, int versionMajor, int ve
 
         QQmlPrivate::createParent<E>, &E::staticMetaObject,
 
-        Q_NULLPTR,
+        nullptr,
         metaObjectRevision
     };
 
@@ -301,9 +301,9 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
@@ -332,9 +332,9 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         metaObjectRevision
     };
 
@@ -363,9 +363,9 @@ int qmlRegisterRevision(const char *uri, int versionMajor, int versionMinor)
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         metaObjectRevision
     };
 
@@ -384,10 +384,10 @@ int qmlRegisterExtendedType()
         qRegisterNormalizedMetaType<T *>(pointerName.constData()),
         qRegisterNormalizedMetaType<QQmlListProperty<T> >(listName.constData()),
         0,
-        Q_NULLPTR,
+        nullptr,
         QString(),
 
-        Q_NULLPTR, 0, 0, Q_NULLPTR, &T::staticMetaObject,
+        nullptr, 0, 0, nullptr, &T::staticMetaObject,
 
         QQmlPrivate::attachedPropertiesFunc<T>(),
         QQmlPrivate::attachedPropertiesMetaObject<T>(),
@@ -398,7 +398,7 @@ int qmlRegisterExtendedType()
 
         QQmlPrivate::createParent<E>, &E::staticMetaObject,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
@@ -437,7 +437,7 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor,
 
         QQmlPrivate::createParent<E>, &E::staticMetaObject,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
@@ -487,7 +487,7 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
         QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
         parser,
         0
@@ -583,7 +583,7 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi
 
         uri, versionMajor, versionMinor, typeName,
 
-        callback, Q_NULLPTR, Q_NULLPTR, 0, 0
+        callback, nullptr, nullptr, 0, 0
     };
 
     return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api);
@@ -601,7 +601,7 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi
 
         uri, versionMajor, versionMinor, typeName,
 
-        Q_NULLPTR, callback, &T::staticMetaObject, qRegisterNormalizedMetaType<T *>(pointerName.constData()), 0
+        nullptr, callback, &T::staticMetaObject, qRegisterNormalizedMetaType<T *>(pointerName.constData()), 0
     };
 
     return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api);
diff --git a/src/qml/qml/qqmlapplicationengine.h b/src/qml/qml/qqmlapplicationengine.h
index 6c57f46c72..d0f9e6d319 100644
--- a/src/qml/qml/qqmlapplicationengine.h
+++ b/src/qml/qml/qqmlapplicationengine.h
@@ -53,9 +53,9 @@ class Q_QML_EXPORT QQmlApplicationEngine : public QQmlEngine
 {
     Q_OBJECT
 public:
-    QQmlApplicationEngine(QObject *parent = Q_NULLPTR);
-    QQmlApplicationEngine(const QUrl &url, QObject *parent = Q_NULLPTR);
-    QQmlApplicationEngine(const QString &filePath, QObject *parent = Q_NULLPTR);
+    QQmlApplicationEngine(QObject *parent = nullptr);
+    QQmlApplicationEngine(const QUrl &url, QObject *parent = nullptr);
+    QQmlApplicationEngine(const QString &filePath, QObject *parent = nullptr);
     ~QQmlApplicationEngine();
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
index ca60f01eb5..b8cc556e4a 100644
--- a/src/qml/qml/qqmlcomponent.h
+++ b/src/qml/qml/qqmlcomponent.h
@@ -77,12 +77,12 @@ public:
     enum CompilationMode { PreferSynchronous, Asynchronous };
     Q_ENUM(CompilationMode)
 
-    QQmlComponent(QObject *parent = Q_NULLPTR);
-    QQmlComponent(QQmlEngine *, QObject *parent = Q_NULLPTR);
-    QQmlComponent(QQmlEngine *, const QString &fileName, QObject *parent = Q_NULLPTR);
-    QQmlComponent(QQmlEngine *, const QString &fileName, CompilationMode mode, QObject *parent = Q_NULLPTR);
-    QQmlComponent(QQmlEngine *, const QUrl &url, QObject *parent = Q_NULLPTR);
-    QQmlComponent(QQmlEngine *, const QUrl &url, CompilationMode mode, QObject *parent = Q_NULLPTR);
+    QQmlComponent(QObject *parent = nullptr);
+    QQmlComponent(QQmlEngine *, QObject *parent = nullptr);
+    QQmlComponent(QQmlEngine *, const QString &fileName, QObject *parent = nullptr);
+    QQmlComponent(QQmlEngine *, const QString &fileName, CompilationMode mode, QObject *parent = nullptr);
+    QQmlComponent(QQmlEngine *, const QUrl &url, QObject *parent = nullptr);
+    QQmlComponent(QQmlEngine *, const QUrl &url, CompilationMode mode, QObject *parent = nullptr);
     virtual ~QQmlComponent();
 
     enum Status { Null, Ready, Loading, Error };
@@ -101,12 +101,12 @@ public:
 
     QUrl url() const;
 
-    virtual QObject *create(QQmlContext *context = Q_NULLPTR);
+    virtual QObject *create(QQmlContext *context = nullptr);
     virtual QObject *beginCreate(QQmlContext *);
     virtual void completeCreate();
 
-    void create(QQmlIncubator &, QQmlContext *context = Q_NULLPTR,
-                QQmlContext *forContext = Q_NULLPTR);
+    void create(QQmlIncubator &, QQmlContext *context = nullptr,
+                QQmlContext *forContext = nullptr);
 
     QQmlContext *creationContext() const;
 
diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h
index 781eac44fc..b2b95b7573 100644
--- a/src/qml/qml/qqmlcontext.h
+++ b/src/qml/qml/qqmlcontext.h
@@ -62,8 +62,8 @@ class Q_QML_EXPORT QQmlContext : public QObject
     Q_DECLARE_PRIVATE(QQmlContext)
 
 public:
-    QQmlContext(QQmlEngine *parent, QObject *objParent = Q_NULLPTR);
-    QQmlContext(QQmlContext *parent, QObject *objParent = Q_NULLPTR);
+    QQmlContext(QQmlEngine *parent, QObject *objParent = nullptr);
+    QQmlContext(QQmlContext *parent, QObject *objParent = nullptr);
     virtual ~QQmlContext();
 
     bool isValid() const;
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 5f4e291775..ea148cb29e 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -131,21 +131,21 @@ int qmlRegisterUncreatableMetaObject(const QMetaObject &staticMetaObject,
         0,
         0,
         0,
-        Q_NULLPTR,
+        nullptr,
         reason,
 
         uri, versionMajor, versionMinor, qmlName, &staticMetaObject,
 
         QQmlAttachedPropertiesFunc(),
-        Q_NULLPTR,
+        nullptr,
 
         0,
         0,
         0,
 
-        Q_NULLPTR, Q_NULLPTR,
+        nullptr, nullptr,
 
-        Q_NULLPTR,
+        nullptr,
         0
     };
 
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h
index 2bf4c0497b..b775054253 100644
--- a/src/qml/qml/qqmlengine.h
+++ b/src/qml/qml/qqmlengine.h
@@ -97,7 +97,7 @@ class Q_QML_EXPORT QQmlEngine : public QJSEngine
     Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath)
     Q_OBJECT
 public:
-    explicit QQmlEngine(QObject *p = Q_NULLPTR);
+    explicit QQmlEngine(QObject *p = nullptr);
     virtual ~QQmlEngine();
 
     QQmlContext *rootContext() const;
diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h
index 5239d59c8a..e9c8770e92 100644
--- a/src/qml/qml/qqmlexpression.h
+++ b/src/qml/qml/qqmlexpression.h
@@ -60,8 +60,8 @@ class Q_QML_EXPORT QQmlExpression : public QObject
     Q_OBJECT
 public:
     QQmlExpression();
-    QQmlExpression(QQmlContext *, QObject *, const QString &, QObject * = Q_NULLPTR);
-    explicit QQmlExpression(const QQmlScriptString &, QQmlContext * = Q_NULLPTR, QObject * = Q_NULLPTR, QObject * = Q_NULLPTR);
+    QQmlExpression(QQmlContext *, QObject *, const QString &, QObject * = nullptr);
+    explicit QQmlExpression(const QQmlScriptString &, QQmlContext * = nullptr, QObject * = nullptr, QObject * = nullptr);
     virtual ~QQmlExpression();
 
     QQmlEngine *engine() const;
@@ -84,7 +84,7 @@ public:
     void clearError();
     QQmlError error() const;
 
-    QVariant evaluate(bool *valueIsUndefined = Q_NULLPTR);
+    QVariant evaluate(bool *valueIsUndefined = nullptr);
 
 Q_SIGNALS:
     void valueChanged();
diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h
index c0915c0abe..84a46fb93e 100644
--- a/src/qml/qml/qqmlextensionplugin.h
+++ b/src/qml/qml/qqmlextensionplugin.h
@@ -58,7 +58,7 @@ class Q_QML_EXPORT QQmlExtensionPlugin
     Q_INTERFACES(QQmlExtensionInterface)
     Q_INTERFACES(QQmlTypesExtensionInterface)
 public:
-    explicit QQmlExtensionPlugin(QObject *parent = Q_NULLPTR);
+    explicit QQmlExtensionPlugin(QObject *parent = nullptr);
     ~QQmlExtensionPlugin();
 
     QUrl baseUrl() const;
diff --git a/src/qml/qml/qqmlfileselector.h b/src/qml/qml/qqmlfileselector.h
index 03b951420e..4eaf92c918 100644
--- a/src/qml/qml/qqmlfileselector.h
+++ b/src/qml/qml/qqmlfileselector.h
@@ -54,7 +54,7 @@ class Q_QML_EXPORT QQmlFileSelector : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQmlFileSelector)
 public:
-    explicit QQmlFileSelector(QQmlEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QQmlFileSelector(QQmlEngine *engine, QObject *parent = nullptr);
     ~QQmlFileSelector();
     QFileSelector *selector() const Q_DECL_NOTHROW;
     void setSelector(QFileSelector *selector);
diff --git a/src/qml/qml/qqmllist.h b/src/qml/qml/qqmllist.h
index e3955deee5..4c6ae0cb8f 100644
--- a/src/qml/qml/qqmllist.h
+++ b/src/qml/qml/qqmllist.h
@@ -61,20 +61,20 @@ public:
     typedef void (*ClearFunction)(QQmlListProperty<T> *);
 
     QQmlListProperty()
-        : object(Q_NULLPTR),
-          data(Q_NULLPTR),
-          append(Q_NULLPTR),
-          count(Q_NULLPTR),
-          at(Q_NULLPTR),
-          clear(Q_NULLPTR),
-          dummy1(Q_NULLPTR),
-          dummy2(Q_NULLPTR)
+        : object(nullptr),
+          data(nullptr),
+          append(nullptr),
+          count(nullptr),
+          at(nullptr),
+          clear(nullptr),
+          dummy1(nullptr),
+          dummy2(nullptr)
     {}
     QQmlListProperty(QObject *o, QList<T *> &list)
         : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
           clear(qlist_clear),
-          dummy1(Q_NULLPTR),
-          dummy2(Q_NULLPTR)
+          dummy1(nullptr),
+          dummy2(nullptr)
     {}
     QQmlListProperty(QObject *o, void *d, AppendFunction a, CountFunction c, AtFunction t,
                     ClearFunction r )
@@ -84,17 +84,17 @@ public:
           count(c),
           at(t),
           clear(r),
-          dummy1(Q_NULLPTR),
-          dummy2(Q_NULLPTR)
+          dummy1(nullptr),
+          dummy2(nullptr)
     {}
     QQmlListProperty(QObject *o, void *d, CountFunction c, AtFunction t)
         : object(o),
           data(d),
-          append(Q_NULLPTR),
+          append(nullptr),
           count(c), at(t),
-          clear(Q_NULLPTR),
-          dummy1(Q_NULLPTR),
-          dummy2(Q_NULLPTR)
+          clear(nullptr),
+          dummy1(nullptr),
+          dummy2(nullptr)
     {}
     bool operator==(const QQmlListProperty &o) const {
         return object == o.object &&
@@ -140,7 +140,7 @@ class Q_QML_EXPORT QQmlListReference
 {
 public:
     QQmlListReference();
-    QQmlListReference(QObject *, const char *property, QQmlEngine * = Q_NULLPTR);
+    QQmlListReference(QObject *, const char *property, QQmlEngine * = nullptr);
     QQmlListReference(const QQmlListReference &);
     QQmlListReference &operator=(const QQmlListReference &);
     ~QQmlListReference();
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 8e6be538ef..4f69017ff0 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -235,7 +235,7 @@ public:
 
     struct PropertyCacheByMinorVersion
     {
-        PropertyCacheByMinorVersion() : cache(Q_NULLPTR), minorVersion(-1) {}
+        PropertyCacheByMinorVersion() : cache(nullptr), minorVersion(-1) {}
         explicit PropertyCacheByMinorVersion(QQmlPropertyCache *pc, int ver) : cache(pc), minorVersion(ver) {}
         QQmlPropertyCachePtr cache;
         int minorVersion;
@@ -840,7 +840,7 @@ QQmlPropertyCache *QQmlTypePrivate::propertyCacheForMinorVersion(int minorVersio
     for (int i = 0; i < propertyCaches.count(); ++i)
         if (propertyCaches.at(i).minorVersion == minorVersion)
             return propertyCaches.at(i).cache;
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void QQmlTypePrivate::setPropertyCacheForMinorVersion(int minorVersion, QQmlPropertyCache *cache)
@@ -2442,7 +2442,7 @@ void QQmlMetaType::freeUnusedTypesAndCaches()
             while (it != data->propertyCaches.end()) {
 
                 if ((*it)->count() == 1) {
-                    QQmlPropertyCache *pc = Q_NULLPTR;
+                    QQmlPropertyCache *pc = nullptr;
                     qSwap(pc, *it);
                     it = data->propertyCaches.erase(it);
                     pc->release();
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp
index 938e2b77e2..e068ad174a 100644
--- a/src/qml/qml/qqmlnotifier.cpp
+++ b/src/qml/qml/qqmlnotifier.cpp
@@ -74,7 +74,7 @@ namespace {
 void QQmlNotifier::notify(QQmlData *ddata, int notifierIndex)
 {
     if (QQmlNotifierEndpoint *ep = ddata->notify(notifierIndex))
-        emitNotify(ep, Q_NULLPTR);
+        emitNotify(ep, nullptr);
 }
 
 void QQmlNotifier::emitNotify(QQmlNotifierEndpoint *endpoint, void **a)
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index ce47ab9fa9..a5cdccc97a 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -399,11 +399,11 @@ ReturnedValue QQmlValueTypeWrapper::get(const Managed *m, String *name, bool *ha
     VALUE_TYPE_LOAD(QMetaType::Bool, bool, bool);
 
     QVariant v;
-    void *args[] = { Q_NULLPTR, Q_NULLPTR };
+    void *args[] = { nullptr, nullptr };
     if (result->propType() == QMetaType::QVariant) {
         args[0] = &v;
     } else {
-        v = QVariant(result->propType(), static_cast<void *>(Q_NULLPTR));
+        v = QVariant(result->propType(), static_cast<void *>(nullptr));
         args[0] = v.data();
     }
     metaObject->d.static_metacall(reinterpret_cast<QObject*>(gadget), QMetaObject::ReadProperty, index, args);
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 1630efe081..25d99e0c87 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -521,7 +521,7 @@ void QtObject::method_matrix4x4(const BuiltinFunction *, Scope &scope, CallData
     QV4::ExecutionEngine *v4 = scope.engine;
 
     if (callData->argc == 0) {
-        scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 0, Q_NULLPTR));
+        scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 0, nullptr));
         return;
     }
 
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h
index 8c5ecce48e..3930ac00a8 100644
--- a/src/qml/util/qqmlpropertymap.h
+++ b/src/qml/util/qqmlpropertymap.h
@@ -55,7 +55,7 @@ class Q_QML_EXPORT QQmlPropertyMap : public QObject
 {
     Q_OBJECT
 public:
-    explicit QQmlPropertyMap(QObject *parent = Q_NULLPTR);
+    explicit QQmlPropertyMap(QObject *parent = nullptr);
     virtual ~QQmlPropertyMap();
 
     QVariant value(const QString &key) const;