Replace Q_NULLPTR with nullptr

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

43 files changed, 138 insertions, 138 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index 4573fb9d9a..8ff0a3ca64 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -432,7 +432,7 @@ QV4::ReturnedValue QV4DataCollector::getValue(Ref ref)
     QV4::Scope scope(engine());
     QV4::ScopedObject array(scope, m_values.value());
     Q_ASSERT(ref < array->getLength());
-    return array->getIndexed(ref, Q_NULLPTR);
+    return array->getIndexed(ref, nullptr);
 }
 
 // TODO: Drop this method once we don't need to support namesAsObjects anymore
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;
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index c0bec7d716..45b405bd82 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -832,7 +832,7 @@ void QQuickAnchors::resetTop()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~TopAnchor;
     d->remDepend(d->topAnchorItem);
-    d->topAnchorItem = Q_NULLPTR;
+    d->topAnchorItem = nullptr;
     d->topAnchorLine = QQuickAnchors::InvalidAnchor;
     emit topChanged();
     d->updateVerticalAnchors();
@@ -872,7 +872,7 @@ void QQuickAnchors::resetBottom()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~BottomAnchor;
     d->remDepend(d->bottomAnchorItem);
-    d->bottomAnchorItem = Q_NULLPTR;
+    d->bottomAnchorItem = nullptr;
     d->bottomAnchorLine = QQuickAnchors::InvalidAnchor;
     emit bottomChanged();
     d->updateVerticalAnchors();
@@ -912,7 +912,7 @@ void QQuickAnchors::resetVerticalCenter()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~VCenterAnchor;
     d->remDepend(d->vCenterAnchorItem);
-    d->vCenterAnchorItem = Q_NULLPTR;
+    d->vCenterAnchorItem = nullptr;
     d->vCenterAnchorLine = QQuickAnchors::InvalidAnchor;
     emit verticalCenterChanged();
     d->updateVerticalAnchors();
@@ -952,7 +952,7 @@ void QQuickAnchors::resetBaseline()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~BaselineAnchor;
     d->remDepend(d->baselineAnchorItem);
-    d->baselineAnchorItem = Q_NULLPTR;
+    d->baselineAnchorItem = nullptr;
     d->baselineAnchorLine = QQuickAnchors::InvalidAnchor;
     emit baselineChanged();
     d->updateVerticalAnchors();
@@ -992,7 +992,7 @@ void QQuickAnchors::resetLeft()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~LeftAnchor;
     d->remDepend(d->leftAnchorItem);
-    d->leftAnchorItem = Q_NULLPTR;
+    d->leftAnchorItem = nullptr;
     d->leftAnchorLine = QQuickAnchors::InvalidAnchor;
     emit leftChanged();
     d->updateHorizontalAnchors();
@@ -1032,7 +1032,7 @@ void QQuickAnchors::resetRight()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~RightAnchor;
     d->remDepend(d->rightAnchorItem);
-    d->rightAnchorItem = Q_NULLPTR;
+    d->rightAnchorItem = nullptr;
     d->rightAnchorLine = QQuickAnchors::InvalidAnchor;
     emit rightChanged();
     d->updateHorizontalAnchors();
@@ -1072,7 +1072,7 @@ void QQuickAnchors::resetHorizontalCenter()
     Q_D(QQuickAnchors);
     d->usedAnchors &= ~HCenterAnchor;
     d->remDepend(d->hCenterAnchorItem);
-    d->hCenterAnchorItem = Q_NULLPTR;
+    d->hCenterAnchorItem = nullptr;
     d->hCenterAnchorLine = QQuickAnchors::InvalidAnchor;
     emit horizontalCenterChanged();
     d->updateHorizontalAnchors();
diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h
index 5988e39514..ae6ca02786 100644
--- a/src/quick/items/qquickanchors_p_p.h
+++ b/src/quick/items/qquickanchors_p_p.h
@@ -90,15 +90,15 @@ public:
         , hCenterOffset(0)
         , baselineOffset(0)
         , item(i)
-        , fill(Q_NULLPTR)
-        , centerIn(Q_NULLPTR)
-        , leftAnchorItem(Q_NULLPTR)
-        , rightAnchorItem(Q_NULLPTR)
-        , topAnchorItem(Q_NULLPTR)
-        , bottomAnchorItem(Q_NULLPTR)
-        , vCenterAnchorItem(Q_NULLPTR)
-        , hCenterAnchorItem(Q_NULLPTR)
-        , baselineAnchorItem(Q_NULLPTR)
+        , fill(nullptr)
+        , centerIn(nullptr)
+        , leftAnchorItem(nullptr)
+        , rightAnchorItem(nullptr)
+        , topAnchorItem(nullptr)
+        , bottomAnchorItem(nullptr)
+        , vCenterAnchorItem(nullptr)
+        , hCenterAnchorItem(nullptr)
+        , baselineAnchorItem(nullptr)
         , leftAnchorLine(QQuickAnchors::InvalidAnchor)
         , leftMarginExplicit(false)
         , rightAnchorLine(QQuickAnchors::InvalidAnchor)
diff --git a/src/quick/items/qquickframebufferobject.h b/src/quick/items/qquickframebufferobject.h
index c70a926b60..d66ca40b3a 100644
--- a/src/quick/items/qquickframebufferobject.h
+++ b/src/quick/items/qquickframebufferobject.h
@@ -75,7 +75,7 @@ public:
         void *data;
     };
 
-    QQuickFramebufferObject(QQuickItem *parent = Q_NULLPTR);
+    QQuickFramebufferObject(QQuickItem *parent = nullptr);
 
     bool textureFollowsItemSize() const;
     void setTextureFollowsItemSize(bool follows);
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 0a5d7adf8b..993d622087 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2488,13 +2488,13 @@ QQuickItem *QQuickItemPrivate::nextTabChildItem(const QQuickItem *item, int star
 {
     if (!item) {
         qWarning() << "QQuickItemPrivate::nextTabChildItem called with null item.";
-        return Q_NULLPTR;
+        return nullptr;
     }
     const QList<QQuickItem *> &children = item->childItems();
     const int count = children.count();
     if (start < 0 || start >= count) {
         qWarning() << "QQuickItemPrivate::nextTabChildItem: Start index value out of range for item" << item;
-        return Q_NULLPTR;
+        return nullptr;
     }
     while (start < count) {
         QQuickItem *child = children.at(start);
@@ -2502,14 +2502,14 @@ QQuickItem *QQuickItemPrivate::nextTabChildItem(const QQuickItem *item, int star
             return child;
         ++start;
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QQuickItem *QQuickItemPrivate::prevTabChildItem(const QQuickItem *item, int start)
 {
     if (!item) {
         qWarning() << "QQuickItemPrivate::prevTabChildItem called with null item.";
-        return Q_NULLPTR;
+        return nullptr;
     }
     const QList<QQuickItem *> &children = item->childItems();
     const int count = children.count();
@@ -2517,7 +2517,7 @@ QQuickItem *QQuickItemPrivate::prevTabChildItem(const QQuickItem *item, int star
         start = count - 1;
     if (start < 0 || start >= count) {
         qWarning() << "QQuickItemPrivate::prevTabChildItem: Start index value out of range for item" << item;
-        return Q_NULLPTR;
+        return nullptr;
     }
     while (start >= 0) {
         QQuickItem *child = children.at(start);
@@ -2525,7 +2525,7 @@ QQuickItem *QQuickItemPrivate::prevTabChildItem(const QQuickItem *item, int star
             return child;
         --start;
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, bool forward)
@@ -2565,8 +2565,8 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
         QQuickItem *last = current;
 
         bool hasChildren = !current->childItems().isEmpty() && current->isEnabled() && current->isVisible();
-        QQuickItem *firstChild = Q_NULLPTR;
-        QQuickItem *lastChild = Q_NULLPTR;
+        QQuickItem *firstChild = nullptr;
+        QQuickItem *lastChild = nullptr;
         if (hasChildren) {
             firstChild = nextTabChildItem(current, 0);
             if (!firstChild)
@@ -2598,11 +2598,11 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
             if (!current->childItems().isEmpty())
                 skip = true;
         // back to the parent
-        } else if (QQuickItem *parent = !isTabFence ? current->parentItem() : Q_NULLPTR) {
+        } else if (QQuickItem *parent = !isTabFence ? current->parentItem() : nullptr) {
             // we would evaluate the parent twice, thus we skip
             if (forward) {
                 skip = true;
-            } else if (QQuickItem *firstSibling = !forward ? nextTabChildItem(parent, 0) : Q_NULLPTR) {
+            } else if (QQuickItem *firstSibling = !forward ? nextTabChildItem(parent, 0) : nullptr) {
                 if (last != firstSibling
                     || (parent->isFocusScope() && parent->activeFocusOnTab() && parent->hasActiveFocus()))
                         skip = true;
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index dc1320c39b..f6ee54e94d 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -59,7 +59,7 @@ class Q_QUICK_EXPORT QQuickTransform : public QObject
 {
     Q_OBJECT
 public:
-    explicit QQuickTransform(QObject *parent = Q_NULLPTR);
+    explicit QQuickTransform(QObject *parent = nullptr);
     ~QQuickTransform();
 
     void appendToItem(QQuickItem *);
@@ -196,7 +196,7 @@ public:
     };
     Q_ENUM(TransformOrigin)
 
-    explicit QQuickItem(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickItem(QQuickItem *parent = nullptr);
     virtual ~QQuickItem();
 
     QQuickWindow *window() const;
@@ -445,7 +445,7 @@ protected:
     virtual void updatePolish();
 
 protected:
-    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = Q_NULLPTR);
+    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = nullptr);
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_resourceObjectDeleted(QObject *))
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index a301c5e4f6..387ce326c2 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -749,7 +749,7 @@ class QQuickEnterKeyAttached : public QObject
     Q_PROPERTY(Qt::EnterKeyType type READ type WRITE setType NOTIFY typeChanged)
 
 public:
-    explicit QQuickEnterKeyAttached(QObject *parent = Q_NULLPTR);
+    explicit QQuickEnterKeyAttached(QObject *parent = nullptr);
 
     Qt::EnterKeyType type() const;
     void setType(Qt::EnterKeyType type);
diff --git a/src/quick/items/qquickitemgrabresult.h b/src/quick/items/qquickitemgrabresult.h
index 30f8f0c2ef..3dc10e2d75 100644
--- a/src/quick/items/qquickitemgrabresult.h
+++ b/src/quick/items/qquickitemgrabresult.h
@@ -82,7 +82,7 @@ private Q_SLOTS:
 private:
     friend class QQuickItem;
 
-    QQuickItemGrabResult(QObject *parent = Q_NULLPTR);
+    QQuickItemGrabResult(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index 54136b1bbf..bdf30469ce 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -491,7 +491,7 @@ void QQuickMultiPointTouchArea::setMouseEnabled(bool arg)
     if (_mouseEnabled != arg) {
         _mouseEnabled = arg;
         if (_mouseTouchPoint && !arg)
-            _mouseTouchPoint = Q_NULLPTR;
+            _mouseTouchPoint = nullptr;
         emit mouseEnabledChanged();
     }
 }
@@ -835,7 +835,7 @@ void QQuickMultiPointTouchArea::mouseReleaseEvent(QMouseEvent *event)
         updateTouchData(event);
         _mouseTouchPoint->setInUse(false);
         _releasedTouchPoints.removeAll(_mouseTouchPoint);
-        _mouseTouchPoint = Q_NULLPTR;
+        _mouseTouchPoint = nullptr;
     }
 
     QQuickWindow *c = window();
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index 8407a6e998..66a0ea83c9 100644
--- a/src/quick/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -57,7 +57,7 @@ class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem
     Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
 
 public:
-    explicit QQuickPaintedItem(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickPaintedItem(QQuickItem *parent = nullptr);
     virtual ~QQuickPaintedItem();
 
     enum RenderTarget {
@@ -118,7 +118,7 @@ Q_SIGNALS:
     void textureSizeChanged();
 
 protected:
-    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = Q_NULLPTR);
+    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = nullptr);
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
     void releaseResources() override;
     void itemChange(ItemChange, const ItemChangeData &) override;
diff --git a/src/quick/items/qquickrendercontrol.h b/src/quick/items/qquickrendercontrol.h
index 31ea176cc1..a626216f84 100644
--- a/src/quick/items/qquickrendercontrol.h
+++ b/src/quick/items/qquickrendercontrol.h
@@ -55,7 +55,7 @@ class Q_QUICK_EXPORT QQuickRenderControl : public QObject
     Q_OBJECT
 
 public:
-    explicit QQuickRenderControl(QObject *parent = Q_NULLPTR);
+    explicit QQuickRenderControl(QObject *parent = nullptr);
     ~QQuickRenderControl();
 
     void prepareThread(QThread *targetThread);
@@ -68,8 +68,8 @@ public:
 
     QImage grab();
 
-    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = Q_NULLPTR);
-    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return Q_NULLPTR; }
+    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = nullptr);
+    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return nullptr; }
 
 Q_SIGNALS:
     void renderRequested();
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 8f0866f417..592485d6fa 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -876,7 +876,7 @@ void QQuickShaderEffectPrivate::updatePolish()
 #if QT_CONFIG(opengl)
 bool QQuickShaderEffect::isOpenGLShaderEffect() const
 {
-    return m_glImpl != Q_NULLPTR;
+    return m_glImpl != nullptr;
 }
 #endif
 
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index 6d3b30e4c4..142607fa39 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -60,9 +60,9 @@ class Q_QUICK_EXPORT QQuickView : public QQuickWindow
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
 public:
-    explicit QQuickView(QWindow *parent = Q_NULLPTR);
+    explicit QQuickView(QWindow *parent = nullptr);
     QQuickView(QQmlEngine* engine, QWindow *parent);
-    explicit QQuickView(const QUrl &source, QWindow *parent = Q_NULLPTR);
+    explicit QQuickView(const QUrl &source, QWindow *parent = nullptr);
     virtual ~QQuickView();
 
     QUrl source() const;
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index 92bc15e625..58cfff5ace 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -106,7 +106,7 @@ public:
     };
     Q_ENUM(TextRenderType)
 
-    explicit QQuickWindow(QWindow *parent = Q_NULLPTR);
+    explicit QQuickWindow(QWindow *parent = nullptr);
     explicit QQuickWindow(QQuickRenderControl *renderControl);
 
     virtual ~QQuickWindow();
@@ -202,7 +202,7 @@ public Q_SLOTS:
     void releaseResources();
 
 protected:
-    QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent = Q_NULLPTR);
+    QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent = nullptr);
 
     void exposeEvent(QExposeEvent *) override;
     void resizeEvent(QResizeEvent *) override;
diff --git a/src/quick/items/qquickwindowattached.cpp b/src/quick/items/qquickwindowattached.cpp
index c8d71139ca..ae62a7a496 100644
--- a/src/quick/items/qquickwindowattached.cpp
+++ b/src/quick/items/qquickwindowattached.cpp
@@ -68,12 +68,12 @@ bool QQuickWindowAttached::isActive() const
 
 QQuickItem *QQuickWindowAttached::activeFocusItem() const
 {
-    return (m_window ? m_window->activeFocusItem() : Q_NULLPTR);
+    return (m_window ? m_window->activeFocusItem() : nullptr);
 }
 
 QQuickItem *QQuickWindowAttached::contentItem() const
 {
-    return (m_window ? m_window->contentItem() : Q_NULLPTR);
+    return (m_window ? m_window->contentItem() : nullptr);
 }
 
 int QQuickWindowAttached::width() const
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index 0137aa981b..e7033e9b8d 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -70,7 +70,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public Q
     Q_PROPERTY(QObject *screen READ screen WRITE setScreen NOTIFY screenChanged REVISION 2)
 
 public:
-    QQuickWindowQmlImpl(QWindow *parent = Q_NULLPTR);
+    QQuickWindowQmlImpl(QWindow *parent = nullptr);
 
     void setVisible(bool visible);
     void setVisibility(Visibility visibility);
diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer.h b/src/quick/scenegraph/coreapi/qsgabstractrenderer.h
index eb9e7cea7c..304dc008d5 100644
--- a/src/quick/scenegraph/coreapi/qsgabstractrenderer.h
+++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
     void sceneGraphChanged();
 
 protected:
-    explicit QSGAbstractRenderer(QObject *parent = Q_NULLPTR);
+    explicit QSGAbstractRenderer(QObject *parent = nullptr);
     virtual void nodeChanged(QSGNode *node, QSGNode::DirtyState state) = 0;
 
 private:
diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index 1467f2233d..f2708b2b96 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -151,7 +151,7 @@ public:
 
     QT_DEPRECATED void clearDirty() { }
     void markDirty(DirtyState bits);
-    QT_DEPRECATED DirtyState dirtyState() const { return Q_NULLPTR; }
+    QT_DEPRECATED DirtyState dirtyState() const { return nullptr; }
 
     virtual bool isSubtreeBlocked() const;
 
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index e176232404..0169f097bc 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -310,7 +310,7 @@ void QSG32BitColorTextShader::updateState(const RenderState &state, QSGMaterial
     QSGTextMaskMaterial *material = static_cast<QSGTextMaskMaterial *>(newEffect);
     QSGTextMaskMaterial *oldMaterial = static_cast<QSGTextMaskMaterial *>(oldEffect);
 
-    if (oldMaterial == Q_NULLPTR || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
+    if (oldMaterial == nullptr || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
         float opacity = material->color().w() * state.opacity();
         program()->setUniformValue(m_color_id, opacity);
     }
diff --git a/src/quick/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h
index 3c8b61852e..514e6e8c2b 100644
--- a/src/quick/scenegraph/util/qsgengine.h
+++ b/src/quick/scenegraph/util/qsgengine.h
@@ -67,7 +67,7 @@ public:
     };
     Q_DECLARE_FLAGS(CreateTextureOptions, CreateTextureOption)
 
-    explicit QSGEngine(QObject *parent = Q_NULLPTR);
+    explicit QSGEngine(QObject *parent = nullptr);
     ~QSGEngine();
 
     void initialize(QOpenGLContext *context);
diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h
index a7abc5a004..7a1bd8ff13 100644
--- a/src/quick/util/qquickanimation_p_p.h
+++ b/src/quick/util/qquickanimation_p_p.h
@@ -199,7 +199,7 @@ public:
     QQuickAnimationGroup *group;
     QAbstractAnimationJob* animationInstance;
 
-    static QQmlProperty createProperty(QObject *obj, const QString &str, QObject *infoObj, QString *errorMessage = Q_NULLPTR);
+    static QQmlProperty createProperty(QObject *obj, const QString &str, QObject *infoObj, QString *errorMessage = nullptr);
 };
 
 class QQuickPauseAnimationPrivate : public QQuickAbstractAnimationPrivate
diff --git a/src/quick/util/qquickshortcut_p.h b/src/quick/util/qquickshortcut_p.h
index be76764e5f..c5d5501cb7 100644
--- a/src/quick/util/qquickshortcut_p.h
+++ b/src/quick/util/qquickshortcut_p.h
@@ -74,7 +74,7 @@ class QQuickShortcut : public QObject, public QQmlParserStatus
     Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext NOTIFY contextChanged FINAL)
 
 public:
-    explicit QQuickShortcut(QObject *parent = Q_NULLPTR);
+    explicit QQuickShortcut(QObject *parent = nullptr);
     ~QQuickShortcut();
 
     QVariant sequence() const;
diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h
index 2d159778ed..e7fbc62967 100644
--- a/src/quickwidgets/qquickwidget.h
+++ b/src/quickwidgets/qquickwidget.h
@@ -64,9 +64,9 @@ class Q_QUICKWIDGETS_EXPORT QQuickWidget : public QWidget
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
 
 public:
-    explicit QQuickWidget(QWidget *parent = Q_NULLPTR);
+    explicit QQuickWidget(QWidget *parent = nullptr);
     QQuickWidget(QQmlEngine* engine, QWidget *parent);
-    explicit QQuickWidget(const QUrl &source, QWidget *parent = Q_NULLPTR);
+    explicit QQuickWidget(const QUrl &source, QWidget *parent = nullptr);
     virtual ~QQuickWidget();
 
     QUrl source() const;