use nullptr consistently (clang-tidy)

From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
author: Shawn Rutledge <shawn.rutledge@qt.io> 2018-02-21 10:41:54 +0100
committer: Shawn Rutledge <shawn.rutledge@qt.io> 2018-02-26 07:13:18 +0000
commit: 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree: 206c90d47387f8322b68f5e3db613189397e1af3 /src/quick
parent: 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
216 files changed, 1227 insertions, 1227 deletions
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 2d6bb02af4..87e581384b 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -92,7 +92,7 @@ QAccessibleInterface *QAccessibleQuickItem::childAt(int x, int y) const
 {
     if (item()->clip()) {
         if (!rect().contains(x, y))
-            return 0;
+            return nullptr;
     }
 
     const QList<QQuickItem*> kids = accessibleUnignoredChildren(item(), true);
@@ -106,14 +106,14 @@ QAccessibleInterface *QAccessibleQuickItem::childAt(int x, int y) const
         }
     }
 
-    return 0;
+    return nullptr;
 }
 
 QAccessibleInterface *QAccessibleQuickItem::parent() const
 {
     QQuickItem *parent = item()->parentItem();
     QQuickWindow *window = item()->window();
-    QQuickItem *ci = window ? window->contentItem() : 0;
+    QQuickItem *ci = window ? window->contentItem() : nullptr;
     while (parent && !QQuickItemPrivate::get(parent)->isAccessible && parent != ci)
         parent = parent->parentItem();
 
@@ -131,7 +131,7 @@ QAccessibleInterface *QAccessibleQuickItem::parent() const
             return QAccessible::queryAccessibleInterface(parent);
         }
     }
-    return 0;
+    return nullptr;
 }
 
 QAccessibleInterface *QAccessibleQuickItem::child(int index) const
@@ -139,7 +139,7 @@ QAccessibleInterface *QAccessibleQuickItem::child(int index) const
     QList<QQuickItem *> children = childItems();
 
     if (index < 0 || index >= children.count())
-        return 0;
+        return nullptr;
 
     QQuickItem *child = children.at(index);
     return QAccessible::queryAccessibleInterface(child);
@@ -458,7 +458,7 @@ QTextDocument *QAccessibleQuickItem::textDocument() const
         QQuickTextDocument *qqdoc = docVariant.value<QQuickTextDocument*>();
         return qqdoc->textDocument();
     }
-    return 0;
+    return nullptr;
 }
 
 int QAccessibleQuickItem::characterCount() const
diff --git a/src/quick/accessible/qaccessiblequickview.cpp b/src/quick/accessible/qaccessiblequickview.cpp
index b3d1b6fc0f..3bb40546be 100644
--- a/src/quick/accessible/qaccessiblequickview.cpp
+++ b/src/quick/accessible/qaccessiblequickview.cpp
@@ -78,7 +78,7 @@ QAccessibleInterface *QAccessibleQuickWindow::child(int index) const
     const QList<QQuickItem*> &kids = rootItems();
     if (index >= 0 && index < kids.count())
         return QAccessible::queryAccessibleInterface(kids.at(index));
-    return 0;
+    return nullptr;
 }
 
 QAccessibleInterface *QAccessibleQuickWindow::focusChild() const
@@ -133,7 +133,7 @@ QAccessibleInterface *QAccessibleQuickWindow::childAt(int x, int y) const
                 return childIface;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 int QAccessibleQuickWindow::indexOfChild(const QAccessibleInterface *iface) const
diff --git a/src/quick/accessible/qquickaccessiblefactory.cpp b/src/quick/accessible/qquickaccessiblefactory.cpp
index a1fa695e5a..1aacf8e8bd 100644
--- a/src/quick/accessible/qquickaccessiblefactory.cpp
+++ b/src/quick/accessible/qquickaccessiblefactory.cpp
@@ -55,11 +55,11 @@ QAccessibleInterface *qQuickAccessibleFactory(const QString &classname, QObject
         Q_ASSERT(item);
         QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
         if (!itemPrivate->isAccessible)
-            return 0;
+            return nullptr;
         return new QAccessibleQuickItem(item);
     }
 
-    return 0;
+    return nullptr;
 }
 
 #endif
diff --git a/src/quick/designer/qqmldesignermetaobject.cpp b/src/quick/designer/qqmldesignermetaobject.cpp
index 63364192c6..09493c30d6 100644
--- a/src/quick/designer/qqmldesignermetaobject.cpp
+++ b/src/quick/designer/qqmldesignermetaobject.cpp
@@ -50,7 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 static QHash<QDynamicMetaObjectData *, bool> nodeInstanceMetaObjectList;
-static void (*notifyPropertyChangeCallBack)(QObject*, const QQuickDesignerSupport::PropertyName &propertyName) = 0;
+static void (*notifyPropertyChangeCallBack)(QObject*, const QQuickDesignerSupport::PropertyName &propertyName) = nullptr;
 
 struct MetaPropertyData {
     inline QPair<QVariant, bool> &getDataRef(int idx) {
@@ -174,7 +174,7 @@ void QQmlDesignerMetaObject::setValue(int id, const QVariant &value)
     QPair<QVariant, bool> &prop = m_data->getDataRef(id);
     prop.first = propertyWriteValue(id, value);
     prop.second = true;
-    QMetaObject::activate(myObject(), id + m_type->signalOffset(), 0);
+    QMetaObject::activate(myObject(), id + m_type->signalOffset(), nullptr);
 }
 
 QVariant QQmlDesignerMetaObject::propertyWriteValue(int, const QVariant &value)
@@ -187,7 +187,7 @@ const QAbstractDynamicMetaObject *QQmlDesignerMetaObject::dynamicMetaObjectParen
     if (QQmlVMEMetaObject::parent.isT1())
         return QQmlVMEMetaObject::parent.asT1()->toDynamicMetaObject(QQmlVMEMetaObject::object);
     else
-        return 0;
+        return nullptr;
 }
 
 const QMetaObject *QQmlDesignerMetaObject::metaObjectParent() const
@@ -218,7 +218,7 @@ int QQmlDesignerMetaObject::openMetaCall(QObject *o, QMetaObject::Call call, int
                 prop.first = propertyWriteValue(propId, *reinterpret_cast<QVariant *>(a[0]));
                 prop.second = true;
                 //propertyWritten(propId);
-                activate(myObject(), m_type->signalOffset() + propId, 0);
+                activate(myObject(), m_type->signalOffset() + propId, nullptr);
             }
         }
         return -1;
diff --git a/src/quick/designer/qquickdesignercustomobjectdata.cpp b/src/quick/designer/qquickdesignercustomobjectdata.cpp
index ca9c1259fd..59e086b5a3 100644
--- a/src/quick/designer/qquickdesignercustomobjectdata.cpp
+++ b/src/quick/designer/qquickdesignercustomobjectdata.cpp
@@ -180,7 +180,7 @@ void QQuickDesignerCustomObjectData::doResetProperty(QQmlContext *context, const
 
     QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
     if (binding && !(hasValidResetBinding(propertyName) && getResetBinding(propertyName) == binding)) {
-        binding->setEnabled(false, 0);
+        binding->setEnabled(false, nullptr);
     }
 
 
diff --git a/src/quick/designer/qquickdesignersupport.cpp b/src/quick/designer/qquickdesignersupport.cpp
index 88971e3172..1851c25a77 100644
--- a/src/quick/designer/qquickdesignersupport.cpp
+++ b/src/quick/designer/qquickdesignersupport.cpp
@@ -78,7 +78,7 @@ QQuickDesignerSupport::~QQuickDesignerSupport()
 
 void QQuickDesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool hide)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return;
 
     QQuickItemPrivate::get(referencedItem)->refFromEffectItem(hide);
@@ -114,7 +114,7 @@ void QQuickDesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool h
 
 void QQuickDesignerSupport::derefFromEffectItem(QQuickItem *referencedItem, bool unhide)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return;
 
     delete m_itemTextureHash.take(referencedItem);
@@ -123,7 +123,7 @@ void QQuickDesignerSupport::derefFromEffectItem(QQuickItem *referencedItem, bool
 
 QImage QQuickDesignerSupport::renderImageForItem(QQuickItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize)
 {
-    if (referencedItem == 0 || referencedItem->parentItem() == 0) {
+    if (referencedItem == nullptr || referencedItem->parentItem() == nullptr) {
         qDebug() << __FILE__ << __LINE__ << "Warning: Item can be rendered.";
         return QImage();
     }
@@ -131,7 +131,7 @@ QImage QQuickDesignerSupport::renderImageForItem(QQuickItem *referencedItem, con
     QSGLayer *renderTexture = m_itemTextureHash.value(referencedItem);
 
     Q_ASSERT(renderTexture);
-    if (renderTexture == 0)
+    if (renderTexture == nullptr)
          return QImage();
     renderTexture->setRect(boundingRect);
     renderTexture->setSize(imageSize);
@@ -150,7 +150,7 @@ QImage QQuickDesignerSupport::renderImageForItem(QQuickItem *referencedItem, con
 
 bool QQuickDesignerSupport::isDirty(QQuickItem *referencedItem, DirtyType dirtyType)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return false;
 
     return QQuickItemPrivate::get(referencedItem)->dirtyAttributes & dirtyType;
@@ -158,7 +158,7 @@ bool QQuickDesignerSupport::isDirty(QQuickItem *referencedItem, DirtyType dirtyT
 
 void QQuickDesignerSupport::addDirty(QQuickItem *referencedItem, QQuickDesignerSupport::DirtyType dirtyType)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return;
 
     QQuickItemPrivate::get(referencedItem)->dirtyAttributes |= dirtyType;
@@ -166,7 +166,7 @@ void QQuickDesignerSupport::addDirty(QQuickItem *referencedItem, QQuickDesignerS
 
 void QQuickDesignerSupport::resetDirty(QQuickItem *referencedItem)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return;
 
     QQuickItemPrivate::get(referencedItem)->dirtyAttributes = 0x0;
@@ -175,7 +175,7 @@ void QQuickDesignerSupport::resetDirty(QQuickItem *referencedItem)
 
 QTransform QQuickDesignerSupport::windowTransform(QQuickItem *referencedItem)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return QTransform();
 
     return QQuickItemPrivate::get(referencedItem)->itemToWindowTransform();
@@ -183,7 +183,7 @@ QTransform QQuickDesignerSupport::windowTransform(QQuickItem *referencedItem)
 
 QTransform QQuickDesignerSupport::parentTransform(QQuickItem *referencedItem)
 {
-    if (referencedItem == 0)
+    if (referencedItem == nullptr)
         return QTransform();
 
     QTransform parentTransform;
@@ -294,31 +294,31 @@ bool QQuickDesignerSupport::hasAnchor(QQuickItem *item, const QString &name)
         return false;
 
     if (name == QLatin1String("anchors.fill"))
-        return anchors(item)->fill() != 0;
+        return anchors(item)->fill() != nullptr;
 
     if (name == QLatin1String("anchors.centerIn"))
-        return anchors(item)->centerIn() != 0;
+        return anchors(item)->centerIn() != nullptr;
 
     if (name == QLatin1String("anchors.right"))
-        return anchors(item)->right().item != 0;
+        return anchors(item)->right().item != nullptr;
 
     if (name == QLatin1String("anchors.top"))
-        return anchors(item)->top().item != 0;
+        return anchors(item)->top().item != nullptr;
 
     if (name == QLatin1String("anchors.left"))
-        return anchors(item)->left().item != 0;
+        return anchors(item)->left().item != nullptr;
 
     if (name == QLatin1String("anchors.bottom"))
-        return anchors(item)->bottom().item != 0;
+        return anchors(item)->bottom().item != nullptr;
 
     if (name == QLatin1String("anchors.horizontalCenter"))
-        return anchors(item)->horizontalCenter().item != 0;
+        return anchors(item)->horizontalCenter().item != nullptr;
 
     if (name == QLatin1String("anchors.verticalCenter"))
-        return anchors(item)->verticalCenter().item != 0;
+        return anchors(item)->verticalCenter().item != nullptr;
 
     if (name == QLatin1String("anchors.baseline"))
-        return anchors(item)->baseline().item != 0;
+        return anchors(item)->baseline().item != nullptr;
 
     return anchors(item)->usedAnchors().testFlag(anchorLineFlagForName(name));
 }
@@ -337,7 +337,7 @@ QQuickItem *QQuickDesignerSupport::anchorCenterInTargetItem(QQuickItem *item)
 
 QPair<QString, QObject*> QQuickDesignerSupport::anchorLineTarget(QQuickItem *item, const QString &name, QQmlContext *context)
 {
-    QObject *targetObject = 0;
+    QObject *targetObject = nullptr;
     QString targetName;
 
     if (name == QLatin1String("anchors.fill")) {
diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp
index 38ba46e702..9fadbb2122 100644
--- a/src/quick/designer/qquickdesignersupportitems.cpp
+++ b/src/quick/designer/qquickdesignersupportitems.cpp
@@ -55,11 +55,11 @@
 
 QT_BEGIN_NAMESPACE
 
-static void (*fixResourcePathsForObjectCallBack)(QObject*) = 0;
+static void (*fixResourcePathsForObjectCallBack)(QObject*) = nullptr;
 
 static void stopAnimation(QObject *object)
 {
-    if (object == 0)
+    if (object == nullptr)
         return;
 
     QQuickTransition *transition = qobject_cast<QQuickTransition*>(object);
@@ -203,7 +203,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, in
 
     Q_UNUSED(disableComponentComplete)
 
-    QObject *object = 0;
+    QObject *object = nullptr;
     QQmlType type = QQmlMetaType::qmlType(typeName, majorNumber, minorNumber);
 
     if (isCrashingType(type)) {
@@ -214,7 +214,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, in
         } else
         {
             if (type.typeName() == "QQmlComponent") {
-                object = new QQmlComponent(context->engine(), 0);
+                object = new QQmlComponent(context->engine(), nullptr);
             } else  {
                 object = type.create();
             }
@@ -235,7 +235,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, in
 
     tweakObjects(object);
 
-    if (object && QQmlEngine::contextForObject(object) == 0)
+    if (object && QQmlEngine::contextForObject(object) == nullptr)
         QQmlEngine::setContextForObject(object, context);
 
     QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
diff --git a/src/quick/designer/qquickdesignersupportmetainfo.cpp b/src/quick/designer/qquickdesignersupportmetainfo.cpp
index b398bae55d..9c8a642837 100644
--- a/src/quick/designer/qquickdesignersupportmetainfo.cpp
+++ b/src/quick/designer/qquickdesignersupportmetainfo.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 bool QQuickDesignerSupportMetaInfo::isSubclassOf(QObject *object, const QByteArray &superTypeName)
 {
-    if (object == 0)
+    if (object == nullptr)
         return false;
 
     const QMetaObject *metaObject = object->metaObject();
diff --git a/src/quick/designer/qquickdesignersupportproperties.cpp b/src/quick/designer/qquickdesignersupportproperties.cpp
index a4d1fd0dc1..674f811f8f 100644
--- a/src/quick/designer/qquickdesignersupportproperties.cpp
+++ b/src/quick/designer/qquickdesignersupportproperties.cpp
@@ -134,7 +134,7 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propert
 
     QObjectList localObjectList;
 
-    if (inspectedObjects == 0)
+    if (inspectedObjects == nullptr)
         inspectedObjects = &localObjectList;
 
 
@@ -191,7 +191,7 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::allProp
 
     QObjectList localObjectList;
 
-    if (inspectedObjects == 0)
+    if (inspectedObjects == nullptr)
         inspectedObjects = &localObjectList;
 
 
diff --git a/src/quick/designer/qquickdesignersupportproperties_p.h b/src/quick/designer/qquickdesignersupportproperties_p.h
index a2872be060..02e75ea886 100644
--- a/src/quick/designer/qquickdesignersupportproperties_p.h
+++ b/src/quick/designer/qquickdesignersupportproperties_p.h
@@ -92,10 +92,10 @@ public:
     static bool isPropertyBlackListed(const QQuickDesignerSupport::PropertyName &propertyName);
     static QQuickDesignerSupport::PropertyNameList propertyNameListForWritableProperties(QObject *object,
                                                                   const QQuickDesignerSupport::PropertyName &baseName = QQuickDesignerSupport::PropertyName(),
-                                                                  QObjectList *inspectedObjects = 0);
+                                                                  QObjectList *inspectedObjects = nullptr);
     static QQuickDesignerSupport::PropertyNameList allPropertyNames(QObject *object,
                                              const QQuickDesignerSupport::PropertyName &baseName = QQuickDesignerSupport::PropertyName(),
-                                             QObjectList *inspectedObjects = 0);
+                                             QObjectList *inspectedObjects = nullptr);
     static bool hasFullImplementedListInterface(const QQmlListReference &list);
 };
 
diff --git a/src/quick/designer/qquickdesignersupportpropertychanges.cpp b/src/quick/designer/qquickdesignersupportpropertychanges.cpp
index 5cafcfc360..0ee8857325 100644
--- a/src/quick/designer/qquickdesignersupportpropertychanges.cpp
+++ b/src/quick/designer/qquickdesignersupportpropertychanges.cpp
@@ -59,7 +59,7 @@ QObject *QQuickDesignerSupportPropertyChanges::targetObject(QObject *propertyCha
     QQuickPropertyChanges *propertyChange = qobject_cast<QQuickPropertyChanges*>(propertyChanges);
 
     if (!propertyChange)
-        return 0;
+        return nullptr;
 
     return propertyChange->object();
 }
@@ -114,7 +114,7 @@ QObject *QQuickDesignerSupportPropertyChanges::stateObject(QObject *propertyChan
     QQuickPropertyChanges *propertyChange = qobject_cast<QQuickPropertyChanges*>(propertyChanges);
 
     if (!propertyChange)
-        return 0;
+        return nullptr;
 
     return propertyChange->state();
 }
diff --git a/src/quick/handlers/qquickdraghandler_p.h b/src/quick/handlers/qquickdraghandler_p.h
index 50f56d78a4..363df31a64 100644
--- a/src/quick/handlers/qquickdraghandler_p.h
+++ b/src/quick/handlers/qquickdraghandler_p.h
@@ -93,7 +93,7 @@ class Q_AUTOTEST_EXPORT QQuickDragHandler : public QQuickSinglePointHandler
     Q_PROPERTY(QVector2D translation READ translation NOTIFY translationChanged)
 
 public:
-    explicit QQuickDragHandler(QObject *parent = 0);
+    explicit QQuickDragHandler(QObject *parent = nullptr);
     ~QQuickDragHandler();
 
     void handleEventPoint(QQuickEventPoint *point) override;
diff --git a/src/quick/handlers/qquickmultipointhandler_p.h b/src/quick/handlers/qquickmultipointhandler_p.h
index 05c3876246..67e550d387 100644
--- a/src/quick/handlers/qquickmultipointhandler_p.h
+++ b/src/quick/handlers/qquickmultipointhandler_p.h
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT QQuickMultiPointHandler : public QQuickPointerDeviceHand
     Q_PROPERTY(qreal pointDistanceThreshold READ pointDistanceThreshold WRITE setPointDistanceThreshold NOTIFY pointDistanceThresholdChanged)
 
 public:
-    explicit QQuickMultiPointHandler(QObject *parent = 0, int minimumPointCount = 2);
+    explicit QQuickMultiPointHandler(QObject *parent = nullptr, int minimumPointCount = 2);
     ~QQuickMultiPointHandler();
 
     int minimumPointCount() const { return m_minimumPointCount; }
diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h
index 7d6b7d9509..9a17971416 100644
--- a/src/quick/handlers/qquickpinchhandler_p.h
+++ b/src/quick/handlers/qquickpinchhandler_p.h
@@ -82,7 +82,7 @@ public:
     };
     Q_ENUM(PinchOrigin)
 
-    explicit QQuickPinchHandler(QObject *parent = 0);
+    explicit QQuickPinchHandler(QObject *parent = nullptr);
     ~QQuickPinchHandler();
 
     qreal minimumScale() const { return m_minimumScale; }
diff --git a/src/quick/handlers/qquickpointerdevicehandler_p.h b/src/quick/handlers/qquickpointerdevicehandler_p.h
index 9e30fa0be4..1638604ea7 100644
--- a/src/quick/handlers/qquickpointerdevicehandler_p.h
+++ b/src/quick/handlers/qquickpointerdevicehandler_p.h
@@ -63,7 +63,7 @@ class Q_AUTOTEST_EXPORT QQuickPointerDeviceHandler : public QQuickPointerHandler
     Q_PROPERTY(Qt::KeyboardModifiers acceptedModifiers READ acceptedModifiers WRITE setAcceptedModifiers NOTIFY acceptedModifiersChanged)
 
 public:
-    explicit QQuickPointerDeviceHandler(QObject *parent = 0);
+    explicit QQuickPointerDeviceHandler(QObject *parent = nullptr);
     ~QQuickPointerDeviceHandler();
 
     QQuickPointerDevice::DeviceTypes acceptedDevices() const { return m_acceptedDevices; }
diff --git a/src/quick/handlers/qquickpointerhandler_p.h b/src/quick/handlers/qquickpointerhandler_p.h
index 06a8248468..9ea6a8b5e2 100644
--- a/src/quick/handlers/qquickpointerhandler_p.h
+++ b/src/quick/handlers/qquickpointerhandler_p.h
@@ -72,7 +72,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerHandler : public QObject, public QQmlP
     Q_PROPERTY(GrabPermissions grabPermissions READ grabPermissions WRITE setGrabPermissions NOTIFY grabPermissionChanged)
 
 public:
-    explicit QQuickPointerHandler(QObject *parent = 0);
+    explicit QQuickPointerHandler(QObject *parent = nullptr);
     virtual ~QQuickPointerHandler();
 
     enum GrabPermission {
diff --git a/src/quick/handlers/qquicksinglepointhandler_p.h b/src/quick/handlers/qquicksinglepointhandler_p.h
index 386cea253a..7606b4f7ba 100644
--- a/src/quick/handlers/qquicksinglepointhandler_p.h
+++ b/src/quick/handlers/qquicksinglepointhandler_p.h
@@ -111,7 +111,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickSinglePointHandler : public QQuickPointerDevi
     Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
     Q_PROPERTY(QQuickHandlerPoint point READ point NOTIFY pointChanged)
 public:
-    explicit QQuickSinglePointHandler(QObject *parent = 0);
+    explicit QQuickSinglePointHandler(QObject *parent = nullptr);
     virtual ~QQuickSinglePointHandler() { }
 
     Qt::MouseButtons acceptedButtons() const { return m_acceptedButtons; }
diff --git a/src/quick/handlers/qquicktaphandler_p.h b/src/quick/handlers/qquicktaphandler_p.h
index 6504ec87f0..e92d2029ba 100644
--- a/src/quick/handlers/qquicktaphandler_p.h
+++ b/src/quick/handlers/qquicktaphandler_p.h
@@ -75,7 +75,7 @@ public:
     };
     Q_ENUM(GesturePolicy)
 
-    explicit QQuickTapHandler(QObject *parent = 0);
+    explicit QQuickTapHandler(QObject *parent = nullptr);
     ~QQuickTapHandler();
 
     bool isPressed() const { return m_pressed; }
diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h
index 0746b7dcd3..95100d2912 100644
--- a/src/quick/items/context2d/qquickcanvascontext_p.h
+++ b/src/quick/items/context2d/qquickcanvascontext_p.h
@@ -69,7 +69,7 @@ class QQuickCanvasContext : public QObject
     Q_OBJECT
 
 public:
-    QQuickCanvasContext(QObject *parent = 0);
+    QQuickCanvasContext(QObject *parent = nullptr);
     ~QQuickCanvasContext();
 
     virtual QStringList contextNames() const = 0;
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 0739889e67..59917ce531 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -71,7 +71,7 @@ public:
 };
 
 QQuickCanvasPixmap::QQuickCanvasPixmap(const QImage& image)
-    : m_pixmap(0)
+    : m_pixmap(nullptr)
     , m_image(image)
 {
 
@@ -123,7 +123,7 @@ QHash<QQmlEngine *,QQuickContext2DRenderThread*> QQuickContext2DRenderThread::re
 QMutex QQuickContext2DRenderThread::renderThreadsMutex;
 
 QQuickContext2DRenderThread::QQuickContext2DRenderThread(QQmlEngine *eng)
-    : QThread(eng), m_engine(eng), m_eventLoopQuitHack(0)
+    : QThread(eng), m_engine(eng), m_eventLoopQuitHack(nullptr)
 {
     Q_ASSERT(eng);
     m_eventLoopQuitHack = new QObject;
@@ -144,7 +144,7 @@ QQuickContext2DRenderThread::~QQuickContext2DRenderThread()
 
 QQuickContext2DRenderThread *QQuickContext2DRenderThread::instance(QQmlEngine *engine)
 {
-    QQuickContext2DRenderThread *thread = 0;
+    QQuickContext2DRenderThread *thread = nullptr;
     renderThreadsMutex.lock();
     if (renderThreads.contains(engine))
         thread = renderThreads.value(engine);
@@ -183,7 +183,7 @@ public:
 
 QQuickCanvasItemPrivate::QQuickCanvasItemPrivate()
     : QQuickItemPrivate()
-    , context(0)
+    , context(nullptr)
     , canvasSize(1, 1)
     , tileSize(1, 1)
     , hasCanvasSize(false)
@@ -192,9 +192,9 @@ QQuickCanvasItemPrivate::QQuickCanvasItemPrivate()
     , available(false)
     , renderTarget(QQuickCanvasItem::Image)
     , renderStrategy(QQuickCanvasItem::Immediate)
-    , textureProvider(0)
-    , node(0)
-    , nodeTexture(0)
+    , textureProvider(nullptr)
+    , node(nullptr)
+    , nodeTexture(nullptr)
 {
     implicitAntialiasing = true;
 }
@@ -634,16 +634,16 @@ void QQuickCanvasItem::releaseResources()
 
     if (d->context) {
         delete d->context;
-        d->context = 0;
+        d->context = nullptr;
     }
-    d->node = 0; // managed by the scene graph, just reset the pointer
+    d->node = nullptr; // managed by the scene graph, just reset the pointer
     if (d->textureProvider) {
         QQuickWindowQObjectCleanupJob::schedule(window(), d->textureProvider);
-        d->textureProvider = 0;
+        d->textureProvider = nullptr;
     }
     if (d->nodeTexture) {
         QQuickWindowQObjectCleanupJob::schedule(window(), d->nodeTexture);
-        d->nodeTexture = 0;
+        d->nodeTexture = nullptr;
     }
 }
 
@@ -663,12 +663,12 @@ void QQuickCanvasItem::invalidateSceneGraph()
     Q_D(QQuickCanvasItem);
     if (d->context)
         d->context->deleteLater();
-    d->context = 0;
-    d->node = 0; // managed by the scene graph, just reset the pointer
+    d->context = nullptr;
+    d->node = nullptr; // managed by the scene graph, just reset the pointer
     delete d->textureProvider;
-    d->textureProvider = 0;
+    d->textureProvider = nullptr;
     delete d->nodeTexture;
-    d->nodeTexture = 0;
+    d->nodeTexture = nullptr;
 }
 
 void QQuickCanvasItem::schedulePolish()
@@ -698,14 +698,14 @@ void QQuickCanvasItem::itemChange(QQuickItem::ItemChange change, const QQuickIte
         return;
     }
 
-    if (value.window== 0)
+    if (value.window== nullptr)
         return;
 
     d->window = value.window;
     QSGRenderContext *context = QQuickWindowPrivate::get(d->window)->context;
 
     // Rendering to FramebufferObject needs a valid OpenGL context.
-    if (context != 0 && (d->renderTarget != FramebufferObject || context->isValid())) {
+    if (context != nullptr && (d->renderTarget != FramebufferObject || context->isValid())) {
         // Defer the call. In some (arguably incorrect) cases we get here due
         // to ItemSceneChange with the user-supplied property values not yet
         // set. Work this around by a deferred invoke. (QTBUG-49692)
@@ -763,11 +763,11 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
 
     if (!d->context || d->canvasWindow.size().isEmpty()) {
         if (d->textureProvider) {
-            d->textureProvider->tex = 0;
+            d->textureProvider->tex = nullptr;
             d->textureProvider->fireTextureChanged();
         }
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
     QSGInternalImageNode *node = static_cast<QSGInternalImageNode *>(oldNode);
@@ -792,13 +792,13 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     QSGTexture *texture = factory->textureForNextFrame(d->nodeTexture, window());
     if (!texture) {
         delete node;
-        d->node = 0;
-        d->nodeTexture = 0;
+        d->node = nullptr;
+        d->nodeTexture = nullptr;
         if (d->textureProvider) {
-            d->textureProvider->tex = 0;
+            d->textureProvider->tex = nullptr;
             d->textureProvider->fireTextureChanged();
         }
-        return 0;
+        return nullptr;
     }
 
     d->nodeTexture = texture;
@@ -833,7 +833,7 @@ QSGTextureProvider *QQuickCanvasItem::textureProvider() const
     if (!w || !w->isSceneGraphInitialized()
             || QThread::currentThread() != QQuickWindowPrivate::get(w)->context->thread()) {
         qWarning("QQuickCanvasItem::textureProvider: can only be queried on the rendering thread of an exposed window");
-        return 0;
+        return nullptr;
     }
 #endif
     if (!d->textureProvider)
@@ -879,7 +879,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args)
 
     QString contextId = str->toQString();
 
-    if (d->context != 0) {
+    if (d->context != nullptr) {
         if (d->context->contextNames().contains(contextId, Qt::CaseInsensitive)) {
             args->setReturnValue(d->context->v4value());
             return;
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index 59de847680..7dc981a6eb 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -114,7 +114,7 @@ public:
     };
     Q_ENUM(RenderStrategy)
 
-    QQuickCanvasItem(QQuickItem *parent = 0);
+    QQuickCanvasItem(QQuickItem *parent = nullptr);
     ~QQuickCanvasItem();
 
     bool isAvailable() const;
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 434765aaa1..af8048f2e4 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -641,7 +641,7 @@ public:
         o->defineDefaultProperty(QStringLiteral("createLinearGradient"), method_createLinearGradient, 0);
         o->defineDefaultProperty(QStringLiteral("strokeRect"), method_strokeRect, 0);
         o->defineDefaultProperty(QStringLiteral("closePath"), method_closePath, 0);
-        o->defineAccessorProperty(QStringLiteral("canvas"), QQuickJSContext2DPrototype::method_get_canvas, 0);
+        o->defineAccessorProperty(QStringLiteral("canvas"), QQuickJSContext2DPrototype::method_get_canvas, nullptr);
 
         return o->d();
     }
@@ -943,9 +943,9 @@ void QV4::Heap::QQuickJSContext2DImageData::init()
     QV4::Scope scope(internalClass->engine);
     QV4::ScopedObject o(scope, this);
 
-    o->defineAccessorProperty(QStringLiteral("width"), ::QQuickJSContext2DImageData::method_get_width, 0);
-    o->defineAccessorProperty(QStringLiteral("height"), ::QQuickJSContext2DImageData::method_get_height, 0);
-    o->defineAccessorProperty(QStringLiteral("data"), ::QQuickJSContext2DImageData::method_get_data, 0);
+    o->defineAccessorProperty(QStringLiteral("width"), ::QQuickJSContext2DImageData::method_get_width, nullptr);
+    o->defineAccessorProperty(QStringLiteral("height"), ::QQuickJSContext2DImageData::method_get_height, nullptr);
+    o->defineAccessorProperty(QStringLiteral("data"), ::QQuickJSContext2DImageData::method_get_data, nullptr);
 }
 
 DEFINE_OBJECT_VTABLE(QQuickJSContext2DImageData);
@@ -4051,10 +4051,10 @@ QMutex QQuickContext2D::mutex;
 QQuickContext2D::QQuickContext2D(QObject *parent)
     : QQuickCanvasContext(parent)
     , m_buffer(new QQuickContext2DCommandBuffer)
-    , m_v4engine(0)
-    , m_surface(0)
-    , m_glContext(0)
-    , m_thread(0)
+    , m_v4engine(nullptr)
+    , m_surface(nullptr)
+    , m_glContext(nullptr)
+    , m_thread(nullptr)
     , m_grabbed(false)
 {
 }
@@ -4062,7 +4062,7 @@ QQuickContext2D::QQuickContext2D(QObject *parent)
 QQuickContext2D::~QQuickContext2D()
 {
     mutex.lock();
-    m_texture->setItem(0);
+    m_texture->setItem(nullptr);
     delete m_buffer;
 
     if (m_renderTarget == QQuickCanvasItem::FramebufferObject) {
@@ -4242,7 +4242,7 @@ QImage QQuickContext2D::toImage(const QRectF& bounds)
         } else {
 #if QT_CONFIG(opengl)
             QQuickWindow *window = m_canvas->window();
-            QOpenGLContext *ctx =  window ? window->openglContext() : 0;
+            QOpenGLContext *ctx =  window ? window->openglContext() : nullptr;
             if (ctx && ctx->isValid()) {
                 if (ctx == QOpenGLContext::currentContext()) {
                     flush();
@@ -4310,7 +4310,7 @@ QQuickContext2DEngineData::QQuickContext2DEngineData(QV4::ExecutionEngine *v4)
     gradientProto = proto;
 
     proto = scope.engine->newObject();
-    proto->defineAccessorProperty(scope.engine->id_length(), QQuickJSContext2DPixelData::proto_get_length, 0);
+    proto->defineAccessorProperty(scope.engine->id_length(), QQuickJSContext2DPixelData::proto_get_length, nullptr);
     pixelArrayProto = proto;
 }
 
@@ -4394,7 +4394,7 @@ void QQuickContext2D::setV4Engine(QV4::ExecutionEngine *engine)
     if (m_v4engine != engine) {
         m_v4engine = engine;
 
-        if (m_v4engine == 0)
+        if (m_v4engine == nullptr)
             return;
 
         QQuickContext2DEngineData *ed = engineData(engine);
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index 334bf08329..4cc07027b1 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -181,7 +181,7 @@ public:
         QQuickContext2D::TextBaseLineType textBaseline;
     };
 
-    QQuickContext2D(QObject *parent = 0);
+    QQuickContext2D(QObject *parent = nullptr);
     ~QQuickContext2D();
 
     QStringList contextNames() const override;
@@ -199,7 +199,7 @@ public:
     QQuickCanvasItem* canvas() const { return m_canvas; }
     QQuickContext2DCommandBuffer* buffer() const { return m_buffer; }
 
-    bool bufferValid() const { return m_buffer != 0; }
+    bool bufferValid() const { return m_buffer != nullptr; }
     void popState();
     void pushState();
     void reset();
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp
index a8bf14ba9f..69ff3b3852 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp
@@ -93,12 +93,12 @@ struct GLAcquireContext {
 };
 #endif
 QQuickContext2DTexture::QQuickContext2DTexture()
-    : m_context(0)
+    : m_context(nullptr)
 #if QT_CONFIG(opengl)
-    , m_gl(0)
+    , m_gl(nullptr)
 #endif
-    , m_surface(0)
-    , m_item(0)
+    , m_surface(nullptr)
+    , m_item(nullptr)
     , m_canvasDevicePixelRatio(1)
     , m_canvasWindowChanged(false)
     , m_dirtyTexture(false)
@@ -159,7 +159,7 @@ void QQuickContext2DTexture::setItem(QQuickCanvasItem* item)
         m_context = (QQuickContext2D*) item->rawContext(); // FIXME
         m_state = m_context->state;
     } else {
-        m_context = 0;
+        m_context = nullptr;
     }
 }
 
@@ -257,7 +257,7 @@ void QQuickContext2DTexture::paintWithoutTiles(QQuickContext2DCommandBuffer *ccb
 
 bool QQuickContext2DTexture::canvasDestroyed()
 {
-    return m_item == 0;
+    return m_item == nullptr;
 }
 
 void QQuickContext2DTexture::paint(QQuickContext2DCommandBuffer *ccb)
@@ -349,7 +349,7 @@ QRect QQuickContext2DTexture::createTiles(const QRect& window)
             int ht = xx + h1;
             int vt = yy + v1;
 
-            QQuickContext2DTile* tile = 0;
+            QQuickContext2DTile* tile = nullptr;
 
             QPoint pos(ht * tw, vt * th);
             QRect rect(pos, m_tileSize);
@@ -420,9 +420,9 @@ static inline QSize npotAdjustedSize(const QSize &size)
 
 QQuickContext2DFBOTexture::QQuickContext2DFBOTexture()
     : QQuickContext2DTexture()
-    , m_fbo(0)
-    , m_multisampledFbo(0)
-    , m_paint_device(0)
+    , m_fbo(nullptr)
+    , m_multisampledFbo(nullptr)
+    , m_paint_device(nullptr)
 {
     m_displayTextures[0] = 0;
     m_displayTextures[1] = 0;
@@ -567,15 +567,15 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
         delete m_fbo;
         delete m_multisampledFbo;
         delete m_paint_device;
-        m_fbo = 0;
-        m_multisampledFbo = 0;
-        m_paint_device = 0;
-        return 0;
+        m_fbo = nullptr;
+        m_multisampledFbo = nullptr;
+        m_paint_device = nullptr;
+        return nullptr;
     } else if (!m_fbo || m_canvasWindowChanged) {
         delete m_fbo;
         delete m_multisampledFbo;
         delete m_paint_device;
-        m_paint_device = 0;
+        m_paint_device = nullptr;
 
         m_fboSize = npotAdjustedSize(m_canvasWindow.size() * m_canvasDevicePixelRatio);
         m_canvasWindowChanged = false;
@@ -722,7 +722,7 @@ QPaintDevice* QQuickContext2DImageTexture::beginPainting()
     QQuickContext2DTexture::beginPainting();
 
     if (m_canvasWindow.size().isEmpty())
-        return 0;
+        return nullptr;
 
 
     if (m_canvasWindowChanged) {
diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index 0e1fbd5d34..9c4870f328 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -146,7 +146,7 @@ protected:
     virtual QVector2D scaleFactor() const { return QVector2D(1, 1); }
 
     void paintWithoutTiles(QQuickContext2DCommandBuffer *ccb);
-    virtual QPaintDevice* beginPainting() {m_painting = true; return 0; }
+    virtual QPaintDevice* beginPainting() {m_painting = true; return nullptr; }
     virtual void endPainting() {m_painting = false;}
     virtual QQuickContext2DTile* createTile() const = 0;
     virtual void compositeTile(QQuickContext2DTile* tile) = 0;
diff --git a/src/quick/items/context2d/qquickcontext2dtile.cpp b/src/quick/items/context2d/qquickcontext2dtile.cpp
index d31fee7f91..0ee3de6bcc 100644
--- a/src/quick/items/context2d/qquickcontext2dtile.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtile.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 QQuickContext2DTile::QQuickContext2DTile()
     : m_dirty(true)
     , m_rect(QRect(0, 0, 1, 1))
-    , m_device(0)
+    , m_device(nullptr)
 {
 }
 
@@ -95,12 +95,12 @@ QPainter* QQuickContext2DTile::createPainter(bool smooth, bool antialiasing)
         return &m_painter;
     }
 
-    return 0;
+    return nullptr;
 }
 #if QT_CONFIG(opengl)
 QQuickContext2DFBOTile::QQuickContext2DFBOTile()
     : QQuickContext2DTile()
-    , m_fbo(0)
+    , m_fbo(nullptr)
 {
 }
 
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index c559ee8887..252d6538e2 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -410,7 +410,7 @@ void QQuickAccessibleAttached::setIgnored(bool ignored)
 
 bool QQuickAccessibleAttached::doAction(const QString &actionName)
 {
-    QMetaMethod *sig = 0;
+    QMetaMethod *sig = nullptr;
     if (actionName == QAccessibleActionInterface::pressAction())
         sig = &sigPress;
     else if (actionName == QAccessibleActionInterface::toggleAction())
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index 4367e230bc..8ee4229013 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -252,35 +252,35 @@ void QQuickAnchorsPrivate::clearItem(QQuickItem *item)
     if (!item)
         return;
     if (fill == item)
-        fill = 0;
+        fill = nullptr;
     if (centerIn == item)
-        centerIn = 0;
+        centerIn = nullptr;
     if (leftAnchorItem == item) {
-        leftAnchorItem = 0;
+        leftAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::LeftAnchor;
     }
     if (rightAnchorItem == item) {
-        rightAnchorItem = 0;
+        rightAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::RightAnchor;
     }
     if (topAnchorItem == item) {
-        topAnchorItem = 0;
+        topAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::TopAnchor;
     }
     if (bottomAnchorItem == item) {
-        bottomAnchorItem = 0;
+        bottomAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::BottomAnchor;
     }
     if (vCenterAnchorItem == item) {
-        vCenterAnchorItem = 0;
+        vCenterAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::VCenterAnchor;
     }
     if (hCenterAnchorItem == item) {
-        hCenterAnchorItem = 0;
+        hCenterAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::HCenterAnchor;
     }
     if (baselineAnchorItem == item) {
-        baselineAnchorItem = 0;
+        baselineAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::BaselineAnchor;
     }
 }
@@ -462,7 +462,7 @@ void QQuickAnchorsPrivate::updateOnComplete()
 
     std::sort(dependencies, dependencies + 9);
 
-    QQuickItem *lastDependency = 0;
+    QQuickItem *lastDependency = nullptr;
     for (int i = 0; i < 9; ++i) {
         QQuickItem *dependency = dependencies[i];
         if (lastDependency != dependency) {
@@ -542,7 +542,7 @@ void QQuickAnchors::setFill(QQuickItem *f)
 
 void QQuickAnchors::resetFill()
 {
-    setFill(0);
+    setFill(nullptr);
 }
 
 QQuickItem *QQuickAnchors::centerIn() const
@@ -578,7 +578,7 @@ void QQuickAnchors::setCenterIn(QQuickItem* c)
 
 void QQuickAnchors::resetCenterIn()
 {
-    setCenterIn(0);
+    setCenterIn(nullptr);
 }
 
 bool QQuickAnchorsPrivate::calcStretch(QQuickItem *edge1Item,
diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h
index bc1e6c10f5..bf83867abb 100644
--- a/src/quick/items/qquickanchors_p.h
+++ b/src/quick/items/qquickanchors_p.h
@@ -86,7 +86,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAnchors : public QObject
     Q_PROPERTY(bool alignWhenCentered READ alignWhenCentered WRITE setAlignWhenCentered NOTIFY centerAlignedChanged)
 
 public:
-    QQuickAnchors(QQuickItem *item, QObject *parent=0);
+    QQuickAnchors(QQuickItem *item, QObject *parent=nullptr);
     virtual ~QQuickAnchors();
 
     enum Anchor
diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h
index ae6ca02786..db929f99f3 100644
--- a/src/quick/items/qquickanchors_p_p.h
+++ b/src/quick/items/qquickanchors_p_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 class QQuickAnchorLine
 {
 public:
-    QQuickAnchorLine() : item(0), anchorLine(QQuickAnchors::InvalidAnchor) {}
+    QQuickAnchorLine() : item(nullptr), anchorLine(QQuickAnchors::InvalidAnchor) {}
     QQuickAnchorLine(QQuickItem *i, QQuickAnchors::Anchor l) : item(i), anchorLine(l) {}
     QQuickAnchorLine(QQuickItem *i, uint l)
         : item(i)
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 5c9f893b63..26dfdb07a6 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -55,12 +55,12 @@ QT_BEGIN_NAMESPACE
 QQuickPixmap* QQuickAnimatedImagePrivate::infoForCurrentFrame(QQmlEngine *engine)
 {
     if (!movie)
-        return 0;
+        return nullptr;
 
     int current = movie->currentFrameNumber();
     if (!frameMap.contains(current)) {
         QUrl requestedUrl;
-        QQuickPixmap *pixmap = 0;
+        QQuickPixmap *pixmap = nullptr;
         if (engine && !movie->fileName().isEmpty()) {
             requestedUrl.setUrl(QString::fromUtf8("quickanimatedimage://%1#%2")
                                 .arg(movie->fileName())
@@ -295,7 +295,7 @@ void QQuickAnimatedImage::setSource(const QUrl &url)
 #if QT_CONFIG(qml_network)
     if (d->reply) {
         d->reply->deleteLater();
-        d->reply = 0;
+        d->reply = nullptr;
     }
 #endif
 
diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h
index 678907a6e2..6b5db215bd 100644
--- a/src/quick/items/qquickanimatedimage_p.h
+++ b/src/quick/items/qquickanimatedimage_p.h
@@ -76,7 +76,7 @@ class Q_AUTOTEST_EXPORT QQuickAnimatedImage : public QQuickImage
     Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
 
 public:
-    QQuickAnimatedImage(QQuickItem *parent=0);
+    QQuickAnimatedImage(QQuickItem *parent=nullptr);
     ~QQuickAnimatedImage();
 
     bool isPlaying() const;
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index 276e6fbb92..d7e60b909c 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -94,7 +94,7 @@ class Q_AUTOTEST_EXPORT QQuickAnimatedSprite : public QQuickItem
     Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY currentFrameChanged)
 
 public:
-    explicit QQuickAnimatedSprite(QQuickItem *parent = 0);
+    explicit QQuickAnimatedSprite(QQuickItem *parent = nullptr);
     enum LoopParameters {
         Infinite = -1
     };
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 75e3a3dbed..4bf34f0417 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -278,7 +278,7 @@ void QQuickBorderImage::setSource(const QUrl &url)
 #if QT_CONFIG(qml_network)
     if (d->sciReply) {
         d->sciReply->deleteLater();
-        d->sciReply = 0;
+        d->sciReply = nullptr;
     }
 #endif
 
@@ -559,12 +559,12 @@ void QQuickBorderImage::sciRequestFinished()
     if (d->sciReply->error() != QNetworkReply::NoError) {
         d->status = Error;
         d->sciReply->deleteLater();
-        d->sciReply = 0;
+        d->sciReply = nullptr;
         emit statusChanged(d->status);
     } else {
         QQuickGridScaledImage sci(d->sciReply);
         d->sciReply->deleteLater();
-        d->sciReply = 0;
+        d->sciReply = nullptr;
         setGridScaledImage(sci);
     }
 }
@@ -629,7 +629,7 @@ QSGNode *QQuickBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat
 
     if (!texture || width() <= 0 || height() <= 0) {
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
     QSGInternalImageNode *node = static_cast<QSGInternalImageNode *>(oldNode);
diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h
index f43e6c8e1e..61bd26ba83 100644
--- a/src/quick/items/qquickborderimage_p.h
+++ b/src/quick/items/qquickborderimage_p.h
@@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QQuickBorderImage : public QQuickImageBase
     Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
 
 public:
-    QQuickBorderImage(QQuickItem *parent=0);
+    QQuickBorderImage(QQuickItem *parent=nullptr);
     ~QQuickBorderImage();
 
     QQuickScaleGrid *border();
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 6dc005a03c..d377b1dad4 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -67,8 +67,8 @@ public:
         return static_cast<QQuickDragAttachedPrivate *>(QObjectPrivate::get(attached)); }
 
     QQuickDragAttachedPrivate()
-        : attachedItem(0)
-        , mimeData(0)
+        : attachedItem(nullptr)
+        , mimeData(nullptr)
         , proposedAction(Qt::MoveAction)
         , supportedActions(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction)
         , active(false)
@@ -231,7 +231,7 @@ void QQuickDragAttachedPrivate::deliverLeaveEvent()
     if (window) {
         QDragLeaveEvent event;
         deliverEvent(window, &event);
-        window = 0;
+        window = nullptr;
     }
 }
 
@@ -686,7 +686,7 @@ int QQuickDragAttached::drop()
         return acceptedAction;
     d->active = false;
 
-    QObject *target = 0;
+    QObject *target = nullptr;
 
     if (d->window) {
         QPoint scenePos = d->attachedItem->mapToScene(d->hotSpot).toPoint();
@@ -732,7 +732,7 @@ void QQuickDragAttached::cancel()
     d->deliverLeaveEvent();
 
     if (d->target) {
-        d->target = 0;
+        d->target = nullptr;
         emit targetChanged();
     }
 
@@ -783,7 +783,7 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct
     deliverLeaveEvent();
 
     if (target) {
-        target = 0;
+        target = nullptr;
         emit q->targetChanged();
     }
 
@@ -836,7 +836,7 @@ void QQuickDragAttached::startDrag(QQmlV4Function *args)
 }
 
 QQuickDrag::QQuickDrag(QObject *parent)
-: QObject(parent), _target(0), _axis(XAndYAxis), _xmin(-FLT_MAX),
+: QObject(parent), _target(nullptr), _axis(XAndYAxis), _xmin(-FLT_MAX),
 _xmax(FLT_MAX), _ymin(-FLT_MAX), _ymax(FLT_MAX), _active(false), _filterChildren(false),
   _smoothed(true), _threshold(QGuiApplication::styleHints()->startDragDistance())
 {
@@ -861,9 +861,9 @@ void QQuickDrag::setTarget(QQuickItem *t)
 
 void QQuickDrag::resetTarget()
 {
-    if (_target == 0)
+    if (_target == nullptr)
         return;
-    _target = 0;
+    _target = nullptr;
     emit targetChanged();
 }
 
diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h
index 17e9d8c690..6bfbae74c9 100644
--- a/src/quick/items/qquickdrag_p.h
+++ b/src/quick/items/qquickdrag_p.h
@@ -83,7 +83,7 @@ class QQuickDragGrabber
     typedef QIntrusiveList<Item, &Item::node> ItemList;
 
 public:
-    QQuickDragGrabber() : m_target(0) {}
+    QQuickDragGrabber() : m_target(nullptr) {}
     ~QQuickDragGrabber() { while (!m_items.isEmpty()) delete m_items.first(); }
 
 
@@ -94,10 +94,10 @@ public:
         else if (!m_items.isEmpty())
             return *m_items.first();
         else
-            return 0;
+            return nullptr;
     }
     void setTarget(QObject *target) { m_target = target; }
-    void resetTarget() { m_target = 0; }
+    void resetTarget() { m_target = nullptr; }
 
     bool isEmpty() const { return m_items.isEmpty(); }
 
@@ -136,7 +136,7 @@ class QQuickDragMimeData : public QMimeData
     Q_OBJECT
 public:
     QQuickDragMimeData()
-        : m_source(0)
+        : m_source(nullptr)
     {
     }
 
@@ -173,7 +173,7 @@ class Q_AUTOTEST_EXPORT QQuickDrag : public QObject
     //### consider drag and drop
 
 public:
-    QQuickDrag(QObject *parent=0);
+    QQuickDrag(QObject *parent=nullptr);
     ~QQuickDrag();
 
     enum DragType { None, Automatic, Internal };
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index c7606f90e1..b77fb40cb1 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -78,7 +78,7 @@ public:
 };
 
 QQuickDropAreaPrivate::QQuickDropAreaPrivate()
-    : drag(0)
+    : drag(nullptr)
     , containsDrag(false)
 {
 }
@@ -303,7 +303,7 @@ void QQuickDropArea::dragLeaveEvent(QDragLeaveEvent *)
     emit exited();
 
     d->containsDrag = false;
-    d->source = 0;
+    d->source = nullptr;
     emit containsDragChanged();
     if (d->drag)
         emit d->drag->sourceChanged();
@@ -328,7 +328,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
     emit dropped(&dragTargetEvent);
 
     d->containsDrag = false;
-    d->source = 0;
+    d->source = nullptr;
     emit containsDragChanged();
     if (d->drag)
         emit d->drag->sourceChanged();
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 0f7e44e0e2..d6aca87f84 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -84,7 +84,7 @@ class QQuickKeyEvent : public QObject
 
 public:
     QQuickKeyEvent()
-        : event(QEvent::None, 0, 0)
+        : event(QEvent::None, 0, nullptr)
     {}
 
     void reset(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
@@ -137,12 +137,12 @@ public:
     QQuickMouseEvent()
       : _x(0), _y(0), _button(Qt::NoButton), _buttons(Qt::NoButton), _modifiers(Qt::NoModifier)
       , _source(Qt::MouseEventNotSynthesized), _wasHeld(false), _isClick(false), _accepted(false)
-      , _flags(Qt::MouseEventFlags(0))
+      , _flags(Qt::MouseEventFlags(nullptr))
     {}
 
     void reset(qreal x, qreal y, Qt::MouseButton button, Qt::MouseButtons buttons,
                Qt::KeyboardModifiers modifiers, bool isClick = false, bool wasHeld = false,
-               Qt::MouseEventFlags flags = 0)
+               Qt::MouseEventFlags flags = nullptr)
     {
         _x = x;
         _y = y;
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 95d1229c8d..8cb64377cc 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -172,13 +172,13 @@ class QQuickFlickableReboundTransition : public QQuickTransitionManager
 {
 public:
     QQuickFlickableReboundTransition(QQuickFlickable *f, const QString &name)
-        : flickable(f), axisData(0), propName(name), active(false)
+        : flickable(f), axisData(nullptr), propName(name), active(false)
     {
     }
 
     ~QQuickFlickableReboundTransition()
     {
-        flickable = 0;
+        flickable = nullptr;
     }
 
     bool startTransition(QQuickFlickablePrivate::AxisData *data, qreal toPos) {
@@ -252,12 +252,12 @@ QQuickFlickablePrivate::QQuickFlickablePrivate()
     , lastPressTime(0)
     , deceleration(QML_FLICK_DEFAULTDECELERATION)
     , maxVelocity(QML_FLICK_DEFAULTMAXVELOCITY), reportedVelocitySmoothing(100)
-    , delayedPressEvent(0), pressDelay(0), fixupDuration(400)
-    , flickBoost(1.0), fixupMode(Normal), vTime(0), visibleArea(0)
+    , delayedPressEvent(nullptr), pressDelay(0), fixupDuration(400)
+    , flickBoost(1.0), fixupMode(Normal), vTime(0), visibleArea(nullptr)
     , flickableDirection(QQuickFlickable::AutoFlickDirection)
     , boundsBehavior(QQuickFlickable::DragAndOvershootBounds)
     , boundsMovement(QQuickFlickable::FollowBoundsBehavior)
-    , rebound(0)
+    , rebound(nullptr)
 {
 }
 
@@ -317,7 +317,7 @@ void QQuickFlickablePrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometr
 {
     Q_Q(QQuickFlickable);
     if (item == contentItem) {
-        Qt::Orientations orient = 0;
+        Qt::Orientations orient = nullptr;
         if (change.xChange())
             orient |= Qt::Horizontal;
         if (change.yChange())
@@ -1555,7 +1555,7 @@ void QQuickFlickablePrivate::clearDelayedPress()
     if (delayedPressEvent) {
         delayedPressTimer.stop();
         delete delayedPressEvent;
-        delayedPressEvent = 0;
+        delayedPressEvent = nullptr;
     }
 }
 
@@ -1565,7 +1565,7 @@ void QQuickFlickablePrivate::replayDelayedPress()
     if (delayedPressEvent) {
         // Losing the grab will clear the delayed press event; take control of it here
         QScopedPointer<QMouseEvent> mouseEvent(delayedPressEvent);
-        delayedPressEvent = 0;
+        delayedPressEvent = nullptr;
         delayedPressTimer.stop();
 
         // If we have the grab, release before delivering the event
@@ -1858,7 +1858,7 @@ int QQuickFlickablePrivate::data_count(QQmlListProperty<QObject> *)
 QObject *QQuickFlickablePrivate::data_at(QQmlListProperty<QObject> *, int)
 {
     // XXX todo
-    return 0;
+    return nullptr;
 }
 
 void QQuickFlickablePrivate::data_clear(QQmlListProperty<QObject> *)
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 4ad01323a4..939e3af698 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -115,7 +115,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
 public:
-    QQuickFlickable(QQuickItem *parent=0);
+    QQuickFlickable(QQuickItem *parent=nullptr);
     ~QQuickFlickable();
 
     QQmlListProperty<QObject> flickableData();
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index c2531e6012..08f069e830 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -99,7 +99,7 @@ public:
     struct AxisData {
         AxisData(QQuickFlickablePrivate *fp, void (QQuickFlickablePrivate::*func)(qreal))
             : move(fp, func)
-            , transitionToBounds(0)
+            , transitionToBounds(nullptr)
             , viewSize(-1), lastPos(0), previousDragDelta(0), velocity(0), startMargin(0), endMargin(0)
             , origin(0), overshoot(0)
             , transitionTo(0)
@@ -284,7 +284,7 @@ class QQuickFlickableVisibleArea : public QObject
     Q_PROPERTY(qreal heightRatio READ heightRatio NOTIFY heightRatioChanged)
 
 public:
-    QQuickFlickableVisibleArea(QQuickFlickable *parent=0);
+    QQuickFlickableVisibleArea(QQuickFlickable *parent=nullptr);
 
     qreal xPosition() const;
     qreal widthRatio() const;
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 4273ed4881..fbba8eed89 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -68,7 +68,7 @@ class QQuickFlipablePrivate : public QQuickItemPrivate
 {
     Q_DECLARE_PUBLIC(QQuickFlipable)
 public:
-    QQuickFlipablePrivate() : current(QQuickFlipable::Front), front(0), back(0), sideDirty(false) {}
+    QQuickFlipablePrivate() : current(QQuickFlipable::Front), front(nullptr), back(nullptr), sideDirty(false) {}
 
     void transformChanged() override;
     void updateSide();
@@ -178,7 +178,7 @@ void QQuickFlipable::setBack(QQuickItem *back)
         qmlWarning(this) << tr("back is a write-once property");
         return;
     }
-    if (back == 0)
+    if (back == nullptr)
         return;
     d->back = back;
     d->back->setParentItem(this);
diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index ec922725ef..d70cd02d35 100644
--- a/src/quick/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -74,7 +74,7 @@ class Q_AUTOTEST_EXPORT QQuickFlipable : public QQuickItem
     //### flipAxis
     //### flipRotation
 public:
-    QQuickFlipable(QQuickItem *parent=0);
+    QQuickFlipable(QQuickItem *parent=nullptr);
     ~QQuickFlipable();
 
     QQuickItem *front() const;
diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h
index b65e543343..af750fc127 100644
--- a/src/quick/items/qquickfocusscope_p.h
+++ b/src/quick/items/qquickfocusscope_p.h
@@ -59,7 +59,7 @@ class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem
 {
     Q_OBJECT
 public:
-    QQuickFocusScope(QQuickItem *parent=0);
+    QQuickFocusScope(QQuickItem *parent=nullptr);
     virtual ~QQuickFocusScope();
 };
 
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index 9b133a823e..48f8b8db5c 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -57,7 +57,7 @@ public:
     QQuickFramebufferObjectPrivate()
         : followsItemSize(true)
         , mirrorVertically(false)
-        , node(0)
+        , node(nullptr)
     {
     }
 
@@ -194,10 +194,10 @@ class QSGFramebufferObjectNode : public QSGTextureProvider, public QSGSimpleText
 
 public:
     QSGFramebufferObjectNode()
-        : window(0)
-        , fbo(0)
-        , msDisplayFbo(0)
-        , renderer(0)
+        : window(nullptr)
+        , fbo(nullptr)
+        , msDisplayFbo(nullptr)
+        , renderer(nullptr)
         , renderPending(true)
         , invalidatePending(false)
         , devicePixelRatio(1)
@@ -282,13 +282,13 @@ QSGNode *QQuickFramebufferObject::updatePaintNode(QSGNode *node, UpdatePaintNode
     // that easily so with this logic, the renderer only goes away when
     // the scenegraph is invalidated or it is removed from the scene.
     if (!n && (width() <= 0 || height() <= 0))
-        return 0;
+        return nullptr;
 
     Q_D(QQuickFramebufferObject);
 
     if (!n) {
         if (!isOpenGL(d->sceneGraphRenderContext()))
-            return 0;
+            return nullptr;
         if (!d->node)
             d->node = new QSGFramebufferObjectNode;
         n = d->node;
@@ -315,9 +315,9 @@ QSGNode *QQuickFramebufferObject::updatePaintNode(QSGNode *node, UpdatePaintNode
     if (n->fbo && ((d->followsItemSize && n->fbo->size() != desiredFboSize) || n->invalidatePending)) {
         delete n->texture();
         delete n->fbo;
-        n->fbo = 0;
+        n->fbo = nullptr;
         delete n->msDisplayFbo;
-        n->msDisplayFbo = 0;
+        n->msDisplayFbo = nullptr;
         n->invalidatePending = false;
     }
 
@@ -368,10 +368,10 @@ QSGTextureProvider *QQuickFramebufferObject::textureProvider() const
     QQuickWindow *w = window();
     if (!w || !w->openglContext() || QThread::currentThread() != w->openglContext()->thread()) {
         qWarning("QQuickFramebufferObject::textureProvider: can only be queried on the rendering thread of an exposed window");
-        return 0;
+        return nullptr;
     }
     if (!isOpenGL(d->sceneGraphRenderContext()))
-        return 0;
+        return nullptr;
     if (!d->node)
         d->node = new QSGFramebufferObjectNode;
     return d->node;
@@ -386,13 +386,13 @@ void QQuickFramebufferObject::releaseResources()
     // forget about the node. Since it is the node we returned from updatePaintNode
     // it will be managed by the scene graph.
     Q_D(QQuickFramebufferObject);
-    d->node = 0;
+    d->node = nullptr;
 }
 
 void QQuickFramebufferObject::invalidateSceneGraph()
 {
     Q_D(QQuickFramebufferObject);
-    d->node = 0;
+    d->node = nullptr;
 }
 
 /*!
@@ -411,7 +411,7 @@ void QQuickFramebufferObject::invalidateSceneGraph()
  * GUI thread is blocked.
  */
 QQuickFramebufferObject::Renderer::Renderer()
-    : data(0)
+    : data(nullptr)
 {
 }
 
@@ -439,7 +439,7 @@ QQuickFramebufferObject::Renderer::~Renderer()
  */
 QOpenGLFramebufferObject *QQuickFramebufferObject::Renderer::framebufferObject() const
 {
-    return data ? ((QSGFramebufferObjectNode *) data)->fbo : 0;
+    return data ? ((QSGFramebufferObjectNode *) data)->fbo : nullptr;
 }
 
 /*!
diff --git a/src/quick/items/qquickgenericshadereffect.cpp b/src/quick/items/qquickgenericshadereffect.cpp
index 305ef7e778..248c2b6ec3 100644
--- a/src/quick/items/qquickgenericshadereffect.cpp
+++ b/src/quick/items/qquickgenericshadereffect.cpp
@@ -61,7 +61,7 @@ QQuickGenericShaderEffect::QQuickGenericShaderEffect(QQuickShaderEffect *item, Q
     , m_mgr(nullptr)
     , m_fragNeedsUpdate(true)
     , m_vertNeedsUpdate(true)
-    , m_dirty(0)
+    , m_dirty(nullptr)
 {
     qRegisterMetaType<QSGGuiThreadShaderEffectManager::ShaderInfo::Type>("ShaderInfo::Type");
     for (int i = 0; i < NShader; ++i)
@@ -134,7 +134,7 @@ void QQuickGenericShaderEffect::setMesh(const QVariant &mesh)
         return;
 
     if (m_mesh)
-        disconnect(m_mesh, SIGNAL(geometryChanged()), this, 0);
+        disconnect(m_mesh, SIGNAL(geometryChanged()), this, nullptr);
 
     m_mesh = newMesh;
 
@@ -290,7 +290,7 @@ QSGNode *QQuickGenericShaderEffect::handleUpdatePaintNode(QSGNode *oldNode, QQui
         m_dirty &= ~QSGShaderEffectNode::DirtyShaderGeometry;
     }
 
-    m_dirty = 0;
+    m_dirty = nullptr;
     for (int i = 0; i < NShader; ++i) {
         m_dirtyConstants[i].clear();
         m_dirtyTextures[i].clear();
diff --git a/src/quick/items/qquickgenericshadereffect_p.h b/src/quick/items/qquickgenericshadereffect_p.h
index ab19816493..3f6f92921b 100644
--- a/src/quick/items/qquickgenericshadereffect_p.h
+++ b/src/quick/items/qquickgenericshadereffect_p.h
@@ -66,7 +66,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickGenericShaderEffect : public QObject
     Q_OBJECT
 
 public:
-    QQuickGenericShaderEffect(QQuickShaderEffect *item, QObject *parent = 0);
+    QQuickGenericShaderEffect(QQuickShaderEffect *item, QObject *parent = nullptr);
     ~QQuickGenericShaderEffect();
 
     QByteArray fragmentShader() const { return m_fragShader; }
diff --git a/src/quick/items/qquickgraphicsinfo.cpp b/src/quick/items/qquickgraphicsinfo.cpp
index a36133874b..e809bdd827 100644
--- a/src/quick/items/qquickgraphicsinfo.cpp
+++ b/src/quick/items/qquickgraphicsinfo.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 QQuickGraphicsInfo::QQuickGraphicsInfo(QQuickItem *item)
     : QObject(item)
-    , m_window(0)
+    , m_window(nullptr)
     , m_api(Unknown)
     , m_shaderType(UnknownShadingLanguage)
     , m_shaderCompilationType(ShaderCompilationType(0))
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index b2adf96f0e..1f5cda9d18 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -230,7 +230,7 @@ public:
         : flow(QQuickGridView::FlowLeftToRight)
         , cellWidth(100), cellHeight(100), columns(1)
         , snapMode(QQuickGridView::NoSnap)
-        , highlightXAnimator(0), highlightYAnimator(0)
+        , highlightXAnimator(nullptr), highlightYAnimator(nullptr)
     {}
     ~QQuickGridViewPrivate()
     {
@@ -390,7 +390,7 @@ FxViewItem *QQuickGridViewPrivate::snapItemAt(qreal pos) const
         if (itemTop+rowSize()/2 >= pos && itemTop - rowSize()/2 <= pos)
             return item;
     }
-    return 0;
+    return nullptr;
 }
 
 int QQuickGridViewPrivate::snapIndex() const
@@ -508,7 +508,7 @@ bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal
     }
 
     int colNum = qFloor((colPos+colSize()/2) / colSize());
-    FxGridItemSG *item = 0;
+    FxGridItemSG *item = nullptr;
     bool changed = false;
 
     QQmlIncubator::IncubationMode incubationMode = doBuffer ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested;
@@ -580,7 +580,7 @@ void QQuickGridViewPrivate::removeItem(FxViewItem *item)
 
 bool QQuickGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
 {
-    FxGridItemSG *item = 0;
+    FxGridItemSG *item = nullptr;
     bool changed = false;
 
     while (visibleItems.count() > 1
@@ -700,14 +700,14 @@ void QQuickGridViewPrivate::createHighlight()
     bool changed = false;
     if (highlight) {
         if (trackedItem == highlight)
-            trackedItem = 0;
+            trackedItem = nullptr;
         delete highlight;
-        highlight = 0;
+        highlight = nullptr;
 
         delete highlightXAnimator;
         delete highlightYAnimator;
-        highlightXAnimator = 0;
-        highlightYAnimator = 0;
+        highlightXAnimator = nullptr;
+        highlightYAnimator = nullptr;
 
         changed = true;
     }
@@ -2410,7 +2410,7 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
         } else {
             while (i >= 0) {
                 // item is before first visible e.g. in cache buffer
-                FxViewItem *item = 0;
+                FxViewItem *item = nullptr;
                 if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                     item->index = modelIndex + i;
                 if (!item)
@@ -2462,7 +2462,7 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
         int i = 0;
         int to = buffer+displayMarginEnd+tempPos+size()-1;
         while (i < count && rowPos <= to + rowSize()*(columns - colNum)/qreal(columns+1)) {
-            FxViewItem *item = 0;
+            FxViewItem *item = nullptr;
             if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                 item->index = modelIndex + i;
             bool newItem = !item;
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index 5c6da2b433..7daeaf41a1 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -81,7 +81,7 @@ public:
     };
     Q_ENUM(Flow)
 
-    QQuickGridView(QQuickItem *parent=0);
+    QQuickGridView(QQuickItem *parent=nullptr);
     ~QQuickGridView();
 
     void setHighlightFollowsCurrentItem(bool) override;
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 7e13e5e0e1..dc2cd17b4e 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -57,7 +57,7 @@ class QQuickImageTextureProvider : public QSGTextureProvider
     Q_OBJECT
 public:
     QQuickImageTextureProvider()
-        : m_texture(0)
+        : m_texture(nullptr)
         , m_smooth(false)
     {
     }
@@ -97,7 +97,7 @@ QQuickImagePrivate::QQuickImagePrivate()
     , mipmap(false)
     , hAlign(QQuickImage::AlignHCenter)
     , vAlign(QQuickImage::AlignVCenter)
-    , provider(0)
+    , provider(nullptr)
 {
 }
 
@@ -583,7 +583,7 @@ QSGTextureProvider *QQuickImage::textureProvider() const
 
     if (!d->window || !d->sceneGraphRenderContext() || QThread::currentThread() != d->sceneGraphRenderContext()->thread()) {
         qWarning("QQuickImage::textureProvider: can only be queried on the rendering thread of an exposed window");
-        return 0;
+        return nullptr;
     }
 
     if (!d->provider) {
@@ -601,7 +601,7 @@ void QQuickImage::invalidateSceneGraph()
 {
     Q_D(QQuickImage);
     delete d->provider;
-    d->provider = 0;
+    d->provider = nullptr;
 }
 
 void QQuickImage::releaseResources()
@@ -609,7 +609,7 @@ void QQuickImage::releaseResources()
     Q_D(QQuickImage);
     if (d->provider) {
         QQuickWindowQObjectCleanupJob::schedule(window(), d->provider);
-        d->provider = 0;
+        d->provider = nullptr;
     }
 }
 
@@ -628,7 +628,7 @@ QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 
     if (!texture || width() <= 0 || height() <= 0) {
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
     QSGInternalImageNode *node = static_cast<QSGInternalImageNode *>(oldNode);
@@ -736,7 +736,7 @@ QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
         || nsrect.isEmpty()
         || !qt_is_finite(nsrect.width()) || !qt_is_finite(nsrect.height())) {
         delete node;
-        return 0;
+        return nullptr;
     }
 
     if (d->pixmapChanged) {
diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 09b2c1eeb7..7fb4413900 100644
--- a/src/quick/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -70,7 +70,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImage : public QQuickImageBase
     Q_PROPERTY(bool autoTransform READ autoTransform WRITE setAutoTransform NOTIFY autoTransformChanged REVISION 2)
 
 public:
-    QQuickImage(QQuickItem *parent=0);
+    QQuickImage(QQuickItem *parent=nullptr);
     ~QQuickImage();
 
     enum HAlignment { AlignLeft = Qt::AlignLeft,
diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h
index 4d4a6fceaf..eb04a1d162 100644
--- a/src/quick/items/qquickimagebase_p.h
+++ b/src/quick/items/qquickimagebase_p.h
@@ -70,7 +70,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImageBase : public QQuickImplicitSizeItem
     Q_PROPERTY(bool mirror READ mirror WRITE setMirror NOTIFY mirrorChanged)
 
 public:
-    QQuickImageBase(QQuickItem *parent=0);
+    QQuickImageBase(QQuickItem *parent=nullptr);
     ~QQuickImageBase();
     enum Status { Null, Ready, Loading, Error };
     Q_ENUM(Status)
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 18e0d30ed5..3a88c49e8d 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -89,7 +89,7 @@ Q_DECLARE_LOGGING_CATEGORY(DBG_MOUSE_TARGET)
 Q_DECLARE_LOGGING_CATEGORY(DBG_HOVER_TRACE)
 Q_DECLARE_LOGGING_CATEGORY(lcTransient)
 
-void debugFocusTree(QQuickItem *item, QQuickItem *scope = 0, int depth = 1)
+void debugFocusTree(QQuickItem *item, QQuickItem *scope = nullptr, int depth = 1)
 {
     if (DBG_FOCUS().isEnabled(QtDebugMsg)) {
         qCDebug(DBG_FOCUS)
@@ -303,9 +303,9 @@ void QQuickContents::itemChildAdded(QQuickItem *, QQuickItem *item)
 }
 
 QQuickItemKeyFilter::QQuickItemKeyFilter(QQuickItem *item)
-: m_processPost(false), m_next(0)
+: m_processPost(false), m_next(nullptr)
 {
-    QQuickItemPrivate *p = item?QQuickItemPrivate::get(item):0;
+    QQuickItemPrivate *p = item?QQuickItemPrivate::get(item):nullptr;
     if (p) {
         m_next = p->extra.value().keyHandler;
         p->extra->keyHandler = this;
@@ -786,7 +786,7 @@ const SigMap sigMap[] = {
     { Qt::Key_Menu, "menuPressed" },
     { Qt::Key_VolumeUp, "volumeUpPressed" },
     { Qt::Key_VolumeDown, "volumeDownPressed" },
-    { 0, 0 }
+    { 0, nullptr }
 };
 
 QByteArray QQuickKeysAttached::keyToSignal(int key)
@@ -1570,7 +1570,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
 */
 
 
-QQuickLayoutMirroringAttached::QQuickLayoutMirroringAttached(QObject *parent) : QObject(parent), itemPrivate(0)
+QQuickLayoutMirroringAttached::QQuickLayoutMirroringAttached(QObject *parent) : QObject(parent), itemPrivate(nullptr)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem *>(parent))
         itemPrivate = QQuickItemPrivate::get(item);
@@ -1724,7 +1724,7 @@ void QQuickItemPrivate::setLayoutMirror(bool mirror)
 */
 
 QQuickEnterKeyAttached::QQuickEnterKeyAttached(QObject *parent)
-    : QObject(parent), itemPrivate(0), keyType(Qt::EnterKeyDefault)
+    : QObject(parent), itemPrivate(nullptr), keyType(Qt::EnterKeyDefault)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem*>(parent)) {
         itemPrivate = QQuickItemPrivate::get(item);
@@ -1777,7 +1777,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
     if (oldSubFocusItem) {
         QQuickItem *sfi = scopePrivate->subFocusItem->parentItem();
         while (sfi && sfi != scope) {
-            QQuickItemPrivate::get(sfi)->subFocusItem = 0;
+            QQuickItemPrivate::get(sfi)->subFocusItem = nullptr;
             sfi = sfi->parentItem();
         }
     }
@@ -1790,7 +1790,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
             sfi = sfi->parentItem();
         }
     } else {
-        scopePrivate->subFocusItem = 0;
+        scopePrivate->subFocusItem = nullptr;
     }
 }
 
@@ -2375,13 +2375,13 @@ QQuickItem::~QQuickItem()
     if (d->windowRefCount > 1)
         d->windowRefCount = 1; // Make sure window is set to null in next call to derefWindow().
     if (d->parentItem)
-        setParentItem(0);
+        setParentItem(nullptr);
     else if (d->window)
         d->derefWindow();
 
     // XXX todo - optimize
     while (!d->childItems.isEmpty())
-        d->childItems.constFirst()->setParentItem(0);
+        d->childItems.constFirst()->setParentItem(nullptr);
 
     if (!d->changeListeners.isEmpty()) {
         const auto listeners = d->changeListeners; // NOTE: intentional copy (QTBUG-54732)
@@ -2421,14 +2421,14 @@ QQuickItem::~QQuickItem()
     }
 
     if (d->extra.isAllocated()) {
-        delete d->extra->contents; d->extra->contents = 0;
+        delete d->extra->contents; d->extra->contents = nullptr;
 #if QT_CONFIG(quick_shadereffect)
-        delete d->extra->layer; d->extra->layer = 0;
+        delete d->extra->layer; d->extra->layer = nullptr;
 #endif
     }
 
-    delete d->_anchors; d->_anchors = 0;
-    delete d->_stateGroup; d->_stateGroup = 0;
+    delete d->_anchors; d->_anchors = nullptr;
+    delete d->_stateGroup; d->_stateGroup = nullptr;
 }
 
 /*!
@@ -2543,7 +2543,7 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
 
     bool all = QGuiApplication::styleHints()->tabFocusBehavior() == Qt::TabFocusAllControls;
 
-    QQuickItem *from = 0;
+    QQuickItem *from = nullptr;
     bool isTabFence = item->d_func()->isTabFence;
     if (forward) {
         if (!isTabFence)
@@ -2678,7 +2678,7 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
 
     if (parentItem) {
         QQuickItem *itemAncestor = parentItem;
-        while (itemAncestor != 0) {
+        while (itemAncestor != nullptr) {
             if (Q_UNLIKELY(itemAncestor == this)) {
                 qWarning() << "QQuickItem::setParentItem: Parent" << parentItem << "is already part of the subtree of" << this;
                 return;
@@ -2690,12 +2690,12 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
     d->removeFromDirtyList();
 
     QQuickItem *oldParentItem = d->parentItem;
-    QQuickItem *scopeFocusedItem = 0;
+    QQuickItem *scopeFocusedItem = nullptr;
 
     if (oldParentItem) {
         QQuickItemPrivate *op = QQuickItemPrivate::get(oldParentItem);
 
-        QQuickItem *scopeItem = 0;
+        QQuickItem *scopeItem = nullptr;
 
         if (hasFocus() || op->subFocusItem == this)
             scopeFocusedItem = this;
@@ -2725,7 +2725,7 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
         QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this);
     }
 
-    QQuickWindow *parentWindow = parentItem ? QQuickItemPrivate::get(parentItem)->window : 0;
+    QQuickWindow *parentWindow = parentItem ? QQuickItemPrivate::get(parentItem)->window : nullptr;
     if (d->window == parentWindow) {
         // Avoid freeing and reallocating resources if the window stays the same.
         d->parentItem = parentItem;
@@ -2745,7 +2745,7 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
         QQuickWindowPrivate::get(d->window)->parentlessItems.insert(this);
 
     d->setEffectiveVisibleRecur(d->calcEffectiveVisible());
-    d->setEffectiveEnableRecur(0, d->calcEffectiveEnable());
+    d->setEffectiveEnableRecur(nullptr, d->calcEffectiveEnable());
 
     if (d->parentItem) {
         if (!scopeFocusedItem) {
@@ -2995,7 +2995,7 @@ void QQuickItemPrivate::refWindow(QQuickWindow *c)
     // derefWindow() decrements the reference count.
 
     Q_Q(QQuickItem);
-    Q_ASSERT((window != 0) == (windowRefCount > 0));
+    Q_ASSERT((window != nullptr) == (windowRefCount > 0));
     Q_ASSERT(c);
     if (++windowRefCount > 1) {
         if (c != window)
@@ -3003,7 +3003,7 @@ void QQuickItemPrivate::refWindow(QQuickWindow *c)
         return; // Window already set.
     }
 
-    Q_ASSERT(window == 0);
+    Q_ASSERT(window == nullptr);
     window = c;
 
     if (polishScheduled)
@@ -3027,7 +3027,7 @@ void QQuickItemPrivate::refWindow(QQuickWindow *c)
 void QQuickItemPrivate::derefWindow()
 {
     Q_Q(QQuickItem);
-    Q_ASSERT((window != 0) == (windowRefCount > 0));
+    Q_ASSERT((window != nullptr) == (windowRefCount > 0));
 
     if (!window)
         return; // This can happen when destroying recursive shader effect sources.
@@ -3043,7 +3043,7 @@ void QQuickItemPrivate::derefWindow()
     c->removeGrabber(q);
 #if QT_CONFIG(cursor)
     if (c->cursorItem == q) {
-        c->cursorItem = 0;
+        c->cursorItem = nullptr;
         window->unsetCursor();
     }
 #endif
@@ -3053,17 +3053,17 @@ void QQuickItemPrivate::derefWindow()
     if (!parentItem)
         c->parentlessItems.remove(q);
 
-    window = 0;
+    window = nullptr;
 
-    itemNodeInstance = 0;
+    itemNodeInstance = nullptr;
 
     if (extra.isAllocated()) {
-        extra->opacityNode = 0;
-        extra->clipNode = 0;
-        extra->rootNode = 0;
+        extra->opacityNode = nullptr;
+        extra->clipNode = nullptr;
+        extra->rootNode = nullptr;
     }
 
-    paintNode = 0;
+    paintNode = nullptr;
 
     for (int ii = 0; ii < childItems.count(); ++ii) {
         QQuickItem *child = childItems.at(ii);
@@ -3073,8 +3073,8 @@ void QQuickItemPrivate::derefWindow()
     dirty(Window);
 
     if (extra.isAllocated() && extra->screenAttached)
-        extra->screenAttached->windowChanged(0);
-    itemChange(QQuickItem::ItemSceneChange, (QQuickWindow *)0);
+        extra->screenAttached->windowChanged(nullptr);
+    itemChange(QQuickItem::ItemSceneChange, (QQuickWindow *)nullptr);
 }
 
 
@@ -3160,8 +3160,8 @@ bool QQuickItem::isComponentComplete() const
 }
 
 QQuickItemPrivate::QQuickItemPrivate()
-    : _anchors(0)
-    , _stateGroup(0)
+    : _anchors(nullptr)
+    , _stateGroup(nullptr)
     , flags(0)
     , widthValid(false)
     , heightValid(false)
@@ -3202,13 +3202,13 @@ QQuickItemPrivate::QQuickItemPrivate()
     , touchEnabled(false)
 #endif
     , dirtyAttributes(0)
-    , nextDirtyItem(0)
-    , prevDirtyItem(0)
-    , window(0)
+    , nextDirtyItem(nullptr)
+    , prevDirtyItem(nullptr)
+    , window(nullptr)
     , windowRefCount(0)
-    , parentItem(0)
+    , parentItem(nullptr)
     , sortedChildItems(&childItems)
-    , subFocusItem(0)
+    , subFocusItem(nullptr)
     , x(0)
     , y(0)
     , width(0)
@@ -3216,8 +3216,8 @@ QQuickItemPrivate::QQuickItemPrivate()
     , implicitWidth(0)
     , implicitHeight(0)
     , baselineOffset(0)
-    , itemNodeInstance(0)
-    , paintNode(0)
+    , itemNodeInstance(nullptr)
+    , paintNode(nullptr)
 {
 }
 
@@ -3342,7 +3342,7 @@ QObject *QQuickItemPrivate::data_at(QQmlListProperty<QObject> *property, int i)
     const int j = i - resourcesCount;
     if (j < children_count(&childrenProperty))
         return children_at(&childrenProperty, j);
-    return 0;
+    return nullptr;
 }
 
 void QQuickItemPrivate::data_clear(QQmlListProperty<QObject> *property)
@@ -3396,7 +3396,7 @@ QQuickItem *QQuickItemPrivate::children_at(QQmlListProperty<QQuickItem> *prop, i
 {
     QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     if (index >= p->childItems.count() || index < 0)
-        return 0;
+        return nullptr;
     else
         return p->childItems.at(index);
 }
@@ -3408,7 +3408,7 @@ void QQuickItemPrivate::children_append(QQmlListProperty<QQuickItem> *prop, QQui
 
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     if (o->parentItem() == that)
-        o->setParentItem(0);
+        o->setParentItem(nullptr);
 
     o->setParentItem(that);
 }
@@ -3424,7 +3424,7 @@ void QQuickItemPrivate::children_clear(QQmlListProperty<QQuickItem> *prop)
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
     while (!p->childItems.isEmpty())
-        p->childItems.at(0)->setParentItem(0);
+        p->childItems.at(0)->setParentItem(nullptr);
 }
 
 int QQuickItemPrivate::visibleChildren_count(QQmlListProperty<QQuickItem> *prop)
@@ -3444,14 +3444,14 @@ QQuickItem *QQuickItemPrivate::visibleChildren_at(QQmlListProperty<QQuickItem> *
     QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     const int childCount = p->childItems.count();
     if (index >= childCount || index < 0)
-        return 0;
+        return nullptr;
 
     int visibleCount = -1;
     for (int i = 0; i < childCount; i++) {
         if (p->childItems.at(i)->isVisible()) visibleCount++;
         if (visibleCount == index) return p->childItems.at(i);
     }
-    return 0;
+    return nullptr;
 }
 
 int QQuickItemPrivate::transform_count(QQmlListProperty<QQuickTransform> *prop)
@@ -3515,7 +3515,7 @@ QQuickTransform *QQuickItemPrivate::transform_at(QQmlListProperty<QQuickTransfor
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
 
     if (idx < 0 || idx >= p->transforms.count())
-        return 0;
+        return nullptr;
     else
         return p->transforms.at(idx);
 }
@@ -3662,7 +3662,7 @@ void QQuickItemPrivate::siblingOrderChanged()
 
 QQmlListProperty<QObject> QQuickItemPrivate::data()
 {
-    return QQmlListProperty<QObject>(q_func(), 0, QQuickItemPrivate::data_append,
+    return QQmlListProperty<QObject>(q_func(), nullptr, QQuickItemPrivate::data_append,
                                              QQuickItemPrivate::data_count,
                                              QQuickItemPrivate::data_at,
                                              QQuickItemPrivate::data_clear);
@@ -3841,11 +3841,11 @@ QSGNode *QQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *upda
 {
     Q_UNUSED(updatePaintNodeData)
     delete oldNode;
-    return 0;
+    return nullptr;
 }
 
 QQuickItem::UpdatePaintNodeData::UpdatePaintNodeData()
-: transformNode(0)
+: transformNode(nullptr)
 {
 }
 
@@ -4410,7 +4410,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const
     QV4::Scope scope(v4);
     QV4::ScopedValue item(scope, (*args)[0]);
 
-    QQuickItem *itemObj = 0;
+    QQuickItem *itemObj = nullptr;
     if (!item->isNull()) {
         QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, item->as<QV4::QObjectWrapper>());
         if (qobjectWrapper)
@@ -4498,7 +4498,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
     QV4::Scope scope(v4);
     QV4::ScopedValue item(scope, (*args)[0]);
 
-    QQuickItem *itemObj = 0;
+    QQuickItem *itemObj = nullptr;
     if (!item->isNull()) {
         QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, item->as<QV4::QObjectWrapper>());
         if (qobjectWrapper)
@@ -4731,12 +4731,12 @@ QQuickItem *QQuickItem::childAt(qreal x, qreal y) const
                 && child->height() > point.y())
             return child;
     }
-    return 0;
+    return nullptr;
 }
 
 QQmlListProperty<QObject> QQuickItemPrivate::resources()
 {
-    return QQmlListProperty<QObject>(q_func(), 0, QQuickItemPrivate::resources_append,
+    return QQmlListProperty<QObject>(q_func(), nullptr, QQuickItemPrivate::resources_append,
                                              QQuickItemPrivate::resources_count,
                                              QQuickItemPrivate::resources_at,
                                              QQuickItemPrivate::resources_clear);
@@ -4761,7 +4761,7 @@ QQmlListProperty<QObject> QQuickItemPrivate::resources()
 */
 QQmlListProperty<QQuickItem> QQuickItemPrivate::children()
 {
-    return QQmlListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::children_append,
+    return QQmlListProperty<QQuickItem>(q_func(), nullptr, QQuickItemPrivate::children_append,
                                              QQuickItemPrivate::children_count,
                                              QQuickItemPrivate::children_at,
                                              QQuickItemPrivate::children_clear);
@@ -4781,7 +4781,7 @@ QQmlListProperty<QQuickItem> QQuickItemPrivate::children()
 QQmlListProperty<QQuickItem> QQuickItemPrivate::visibleChildren()
 {
     return QQmlListProperty<QQuickItem>(q_func(),
-                                        0,
+                                        nullptr,
                                         QQuickItemPrivate::visibleChildren_count,
                                         QQuickItemPrivate::visibleChildren_at);
 
@@ -4931,7 +4931,7 @@ void QQuickItem::setState(const QString &state)
   */
 QQmlListProperty<QQuickTransform> QQuickItem::transform()
 {
-    return QQmlListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append,
+    return QQmlListProperty<QQuickTransform>(this, nullptr, QQuickItemPrivate::transform_append,
                                                      QQuickItemPrivate::transform_count,
                                                      QQuickItemPrivate::transform_at,
                                                      QQuickItemPrivate::transform_clear);
@@ -6065,8 +6065,8 @@ void QQuickItemPrivate::removeFromDirtyList()
     if (prevDirtyItem) {
         if (nextDirtyItem) QQuickItemPrivate::get(nextDirtyItem)->prevDirtyItem = prevDirtyItem;
         *prevDirtyItem = nextDirtyItem;
-        prevDirtyItem = 0;
-        nextDirtyItem = 0;
+        prevDirtyItem = nullptr;
+        nextDirtyItem = nullptr;
     }
     Q_ASSERT(!prevDirtyItem);
     Q_ASSERT(!nextDirtyItem);
@@ -7135,7 +7135,7 @@ QQuickItem *QQuickItem::scopedFocusItem() const
 {
     Q_D(const QQuickItem);
     if (!isFocusScope())
-        return 0;
+        return nullptr;
     else
         return d->subFocusItem;
 }
@@ -8056,7 +8056,7 @@ QSGTextureProvider *QQuickItem::textureProvider() const
 #if QT_CONFIG(quick_shadereffect)
     Q_D(const QQuickItem);
     return d->extra.isAllocated() && d->extra->layer && d->extra->layer->effectSource() ?
-           d->extra->layer->effectSource()->textureProvider() : 0;
+           d->extra->layer->effectSource()->textureProvider() : nullptr;
 #else
     return 0;
 #endif
@@ -8095,9 +8095,9 @@ QQuickItemLayer::QQuickItemLayer(QQuickItem *item)
     , m_wrapMode(QQuickShaderEffectSource::ClampToEdge)
     , m_format(QQuickShaderEffectSource::RGBA)
     , m_name("source")
-    , m_effectComponent(0)
-    , m_effect(0)
-    , m_effectSource(0)
+    , m_effectComponent(nullptr)
+    , m_effect(nullptr)
+    , m_effectSource(nullptr)
     , m_textureMirroring(QQuickShaderEffectSource::MirrorVertically)
     , m_samples(0)
 {
@@ -8198,7 +8198,7 @@ void QQuickItemLayer::deactivate()
         deactivateEffect();
 
     delete m_effectSource;
-    m_effectSource = 0;
+    m_effectSource = nullptr;
 
     QQuickItemPrivate *id = QQuickItemPrivate::get(m_item);
     id->removeItemChangeListener(this,  QQuickItemPrivate::Geometry | QQuickItemPrivate::Opacity | QQuickItemPrivate::Parent | QQuickItemPrivate::Visibility | QQuickItemPrivate::SiblingOrder);
@@ -8235,7 +8235,7 @@ void QQuickItemLayer::deactivateEffect()
     Q_ASSERT(m_effectComponent);
 
     delete m_effect;
-    m_effect = 0;
+    m_effect = nullptr;
 }
 
 
@@ -8543,7 +8543,7 @@ void QQuickItemLayer::itemParentChanged(QQuickItem *item, QQuickItem *parent)
     Q_UNUSED(item)
     Q_ASSERT(item == m_item);
     Q_ASSERT(parent != m_effectSource);
-    Q_ASSERT(parent == 0 || parent != m_effect);
+    Q_ASSERT(parent == nullptr || parent != m_effect);
 
     m_effectSource->setParentItem(parent);
     if (parent)
@@ -8615,16 +8615,16 @@ void QQuickItemLayer::updateMatrix()
 
 QQuickItemPrivate::ExtraData::ExtraData()
 : z(0), scale(1), rotation(0), opacity(1),
-  contents(0), screenAttached(0), layoutDirectionAttached(0),
-  enterKeyAttached(0),
-  keyHandler(0),
+  contents(nullptr), screenAttached(nullptr), layoutDirectionAttached(nullptr),
+  enterKeyAttached(nullptr),
+  keyHandler(nullptr),
 #if QT_CONFIG(quick_shadereffect)
-  layer(0),
+  layer(nullptr),
 #endif
   effectRefCount(0), hideRefCount(0),
   recursiveEffectRefCount(0),
-  opacityNode(0), clipNode(0), rootNode(0),
-  acceptedMouseButtons(0), origin(QQuickItem::Center),
+  opacityNode(nullptr), clipNode(nullptr), rootNode(nullptr),
+  acceptedMouseButtons(nullptr), origin(QQuickItem::Center),
   transparentForPositioner(false)
 {
 }
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index ee854bb2ac..2e91e2111c 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -97,7 +97,7 @@ public:
 
     QRectF rectF() const { return m_contents; }
 
-    inline void calcGeometry(QQuickItem *changed = 0);
+    inline void calcGeometry(QQuickItem *changed = nullptr);
     void complete();
 
 protected:
@@ -108,8 +108,8 @@ protected:
     //void itemVisibilityChanged(QQuickItem *item)
 
 private:
-    bool calcHeight(QQuickItem *changed = 0);
-    bool calcWidth(QQuickItem *changed = 0);
+    bool calcHeight(QQuickItem *changed = nullptr);
+    bool calcWidth(QQuickItem *changed = nullptr);
     void updateRect();
 
     QQuickItem *m_item;
@@ -330,7 +330,7 @@ public:
     Q_DECLARE_FLAGS(ChangeTypes, ChangeType)
 
     struct ChangeListener {
-        ChangeListener(QQuickItemChangeListener *l = nullptr, QQuickItemPrivate::ChangeTypes t = 0) : listener(l), types(t), gTypes(QQuickGeometryChange::All) {}
+        ChangeListener(QQuickItemChangeListener *l = nullptr, QQuickItemPrivate::ChangeTypes t = nullptr) : listener(l), types(t), gTypes(QQuickGeometryChange::All) {}
         ChangeListener(QQuickItemChangeListener *l, QQuickGeometryChange gt) : listener(l), types(Geometry), gTypes(gt) {}
         QQuickItemChangeListener *listener;
         QQuickItemPrivate::ChangeTypes types;
@@ -605,9 +605,9 @@ public:
          - (rootNode) (shader effect source's root node)
      */
 
-    QSGOpacityNode *opacityNode() const { return extra.isAllocated()?extra->opacityNode:0; }
-    QQuickDefaultClipNode *clipNode() const { return extra.isAllocated()?extra->clipNode:0; }
-    QSGRootNode *rootNode() const { return extra.isAllocated()?extra->rootNode:0; }
+    QSGOpacityNode *opacityNode() const { return extra.isAllocated()?extra->opacityNode:nullptr; }
+    QQuickDefaultClipNode *clipNode() const { return extra.isAllocated()?extra->clipNode:nullptr; }
+    QSGRootNode *rootNode() const { return extra.isAllocated()?extra->rootNode:nullptr; }
 
     QSGTransformNode *itemNodeInstance;
     QSGNode *paintNode;
@@ -639,7 +639,7 @@ public:
 class QQuickItemKeyFilter
 {
 public:
-    QQuickItemKeyFilter(QQuickItem * = 0);
+    QQuickItemKeyFilter(QQuickItem * = nullptr);
     virtual ~QQuickItemKeyFilter();
 
     virtual void keyPressed(QKeyEvent *event, bool post);
@@ -662,7 +662,7 @@ class QQuickKeyNavigationAttachedPrivate : public QObjectPrivate
 public:
     QQuickKeyNavigationAttachedPrivate()
         : QObjectPrivate(),
-          left(0), right(0), up(0), down(0), tab(0), backtab(0),
+          left(nullptr), right(nullptr), up(nullptr), down(nullptr), tab(nullptr), backtab(nullptr),
           leftSet(false), rightSet(false), upSet(false), downSet(false),
           tabSet(false), backtabSet(false) {}
 
@@ -694,7 +694,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickKeyNavigationAttached : public QObject, publi
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
 public:
-    QQuickKeyNavigationAttached(QObject * = 0);
+    QQuickKeyNavigationAttached(QObject * = nullptr);
 
     QQuickItem *left() const;
     void setLeft(QQuickItem *);
@@ -739,7 +739,7 @@ class QQuickLayoutMirroringAttached : public QObject
     Q_PROPERTY(bool childrenInherit READ childrenInherit WRITE setChildrenInherit NOTIFY childrenInheritChanged)
 
 public:
-    explicit QQuickLayoutMirroringAttached(QObject *parent = 0);
+    explicit QQuickLayoutMirroringAttached(QObject *parent = nullptr);
 
     bool enabled() const;
     void setEnabled(bool);
@@ -783,7 +783,7 @@ class QQuickKeysAttachedPrivate : public QObjectPrivate
 public:
     QQuickKeysAttachedPrivate()
         : QObjectPrivate(), inPress(false), inRelease(false)
-        , inIM(false), enabled(true), imeItem(0), item(0)
+        , inIM(false), enabled(true), imeItem(nullptr), item(nullptr)
     {}
 
     //loop detection
@@ -809,7 +809,7 @@ class QQuickKeysAttached : public QObject, public QQuickItemKeyFilter
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
 public:
-    QQuickKeysAttached(QObject *parent=0);
+    QQuickKeysAttached(QObject *parent=nullptr);
     ~QQuickKeysAttached();
 
     bool enabled() const { Q_D(const QQuickKeysAttached); return d->enabled; }
@@ -898,7 +898,7 @@ private:
 Qt::MouseButtons QQuickItemPrivate::acceptedMouseButtons() const
 {
     return ((extra.flag() ? Qt::LeftButton : Qt::MouseButton(0)) |
-            (extra.isAllocated() ? extra->acceptedMouseButtons : Qt::MouseButtons(0)));
+            (extra.isAllocated() ? extra->acceptedMouseButtons : Qt::MouseButtons(nullptr)));
 }
 
 QSGContext *QQuickItemPrivate::sceneGraphContext() const
@@ -920,7 +920,7 @@ void QQuickItemPrivate::markSortedChildrenDirty(QQuickItem *child)
     if (child->z() != 0. || sortedChildItems != &childItems) {
         if (sortedChildItems != &childItems)
             delete sortedChildItems;
-        sortedChildItems = 0;
+        sortedChildItems = nullptr;
     }
 }
 
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index 4b5c81b4d4..e913e5ba05 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -371,7 +371,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
 
     if (data->actions.count()) {
         QSequentialAnimationGroupJob *topLevelGroup = new QSequentialAnimationGroupJob;
-        QActionAnimation *viaAction = d->via ? new QActionAnimation : 0;
+        QActionAnimation *viaAction = d->via ? new QActionAnimation : nullptr;
         QActionAnimation *targetAction = new QActionAnimation;
         //we'll assume the common case by far is to have children, and always create ag
         QParallelAnimationGroupJob *ag = new QParallelAnimationGroupJob;
@@ -409,7 +409,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
         delete data;
         delete viaData;
     }
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -922,12 +922,12 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actio
         pa->setEasingCurve(d->easingCurve);
         return initInstance(pa);
     } else {
-        pa->setFromSourcedValue(0);
-        pa->setAnimValue(0);
+        pa->setFromSourcedValue(nullptr);
+        pa->setAnimValue(nullptr);
         delete pa;
         delete data;
     }
-    return 0;
+    return nullptr;
 }
 
 void QQuickPathAnimationUpdater::setValue(qreal v)
@@ -955,7 +955,7 @@ void QQuickPathAnimationUpdater::setValue(qreal v)
 
     qreal angle;
     bool fixed = orientation == QQuickPathAnimation::Fixed;
-    QPointF currentPos = !painterPath.isEmpty() ? path->sequentialPointAt(painterPath, pathLength, attributePoints, prevBez, v, fixed ? 0 : &angle) : path->sequentialPointAt(v, fixed ? 0 : &angle);
+    QPointF currentPos = !painterPath.isEmpty() ? path->sequentialPointAt(painterPath, pathLength, attributePoints, prevBez, v, fixed ? nullptr : &angle) : path->sequentialPointAt(v, fixed ? nullptr : &angle);
 
     //adjust position according to anchor point
     if (!anchorPoint.isNull()) {
diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h
index 3b3fad9cc4..b803455f12 100644
--- a/src/quick/items/qquickitemanimation_p.h
+++ b/src/quick/items/qquickitemanimation_p.h
@@ -68,7 +68,7 @@ class Q_AUTOTEST_EXPORT QQuickParentAnimation : public QQuickAnimationGroup
     Q_PROPERTY(QQuickItem *via READ via WRITE setVia NOTIFY viaChanged)
 
 public:
-    QQuickParentAnimation(QObject *parent=0);
+    QQuickParentAnimation(QObject *parent=nullptr);
     virtual ~QQuickParentAnimation();
 
     QQuickItem *target() const;
@@ -89,7 +89,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 };
 
 class QQuickAnchorAnimationPrivate;
@@ -102,7 +102,7 @@ class Q_AUTOTEST_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation
     Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
 
 public:
-    QQuickAnchorAnimation(QObject *parent=0);
+    QQuickAnchorAnimation(QObject *parent=nullptr);
     virtual ~QQuickAnchorAnimation();
 
     QQmlListProperty<QQuickItem> targets();
@@ -121,7 +121,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 };
 
 #if QT_CONFIG(quick_path)
@@ -145,7 +145,7 @@ class Q_AUTOTEST_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation
     Q_PROPERTY(qreal endRotation READ endRotation WRITE setEndRotation NOTIFY endRotationChanged)
 
 public:
-    QQuickPathAnimation(QObject *parent=0);
+    QQuickPathAnimation(QObject *parent=nullptr);
     virtual ~QQuickPathAnimation();
 
     enum Orientation {
@@ -188,7 +188,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 Q_SIGNALS:
     void durationChanged(int);
     void easingChanged(const QEasingCurve &);
diff --git a/src/quick/items/qquickitemanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h
index 2d075dfab3..83b9899197 100644
--- a/src/quick/items/qquickitemanimation_p_p.h
+++ b/src/quick/items/qquickitemanimation_p_p.h
@@ -65,7 +65,7 @@ class QQuickParentAnimationPrivate : public QQuickAnimationGroupPrivate
     Q_DECLARE_PUBLIC(QQuickParentAnimation)
 public:
  QQuickParentAnimationPrivate()
-    : QQuickAnimationGroupPrivate(), target(0), newParent(0), via(0) {}
+    : QQuickAnimationGroupPrivate(), target(nullptr), newParent(nullptr), via(nullptr) {}
 
     QQuickItem *target;
     QQuickItem *newParent;
@@ -91,7 +91,7 @@ public:
 class QQuickPathAnimationUpdater : public QQuickBulkValueUpdater
 {
 public:
-    QQuickPathAnimationUpdater() : path(0), pathLength(0), target(0), reverse(false),
+    QQuickPathAnimationUpdater() : path(nullptr), pathLength(0), target(nullptr), reverse(false),
         fromSourced(false), fromDefined(false), toDefined(false),
         toX(0), toY(0), currentV(0), orientation(QQuickPathAnimation::Fixed),
         entryInterval(0), exitInterval(0) {}
@@ -128,10 +128,10 @@ class QQuickPathAnimationPrivate;
 class QQuickPathAnimationAnimator : public QQuickBulkValueAnimator
 {
 public:
-    QQuickPathAnimationAnimator(QQuickPathAnimationPrivate * = 0);
+    QQuickPathAnimationAnimator(QQuickPathAnimationPrivate * = nullptr);
     ~QQuickPathAnimationAnimator();
 
-    void clearTemplate() { animationTemplate = 0; }
+    void clearTemplate() { animationTemplate = nullptr; }
 
     QQuickPathAnimationUpdater *pathUpdater() const { return static_cast<QQuickPathAnimationUpdater*>(getAnimValue()); }
 private:
@@ -142,7 +142,7 @@ class QQuickPathAnimationPrivate : public QQuickAbstractAnimationPrivate
 {
     Q_DECLARE_PUBLIC(QQuickPathAnimation)
 public:
-    QQuickPathAnimationPrivate() : path(0), target(0),
+    QQuickPathAnimationPrivate() : path(nullptr), target(nullptr),
         orientation(QQuickPathAnimation::Fixed), entryDuration(0), exitDuration(0), duration(250) {}
 
     QQuickPath *path;
diff --git a/src/quick/items/qquickitemchangelistener_p.h b/src/quick/items/qquickitemchangelistener_p.h
index cb0af75c4c..31d06c9983 100644
--- a/src/quick/items/qquickitemchangelistener_p.h
+++ b/src/quick/items/qquickitemchangelistener_p.h
@@ -135,7 +135,7 @@ public:
     virtual void itemImplicitWidthChanged(QQuickItem *) {}
     virtual void itemImplicitHeightChanged(QQuickItem *) {}
 
-    virtual QQuickAnchorsPrivate *anchorPrivate() { return 0; }
+    virtual QQuickAnchorsPrivate *anchorPrivate() { return nullptr; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickitemgrabresult.cpp b/src/quick/items/qquickitemgrabresult.cpp
index c3f8d4f024..003fde8c9e 100644
--- a/src/quick/items/qquickitemgrabresult.cpp
+++ b/src/quick/items/qquickitemgrabresult.cpp
@@ -62,9 +62,9 @@ class QQuickItemGrabResultPrivate : public QObjectPrivate
 {
 public:
     QQuickItemGrabResultPrivate()
-        : cacheEntry(0)
-        , qmlEngine(0)
-        , texture(0)
+        : cacheEntry(nullptr)
+        , qmlEngine(nullptr)
+        , texture(nullptr)
     {
     }
 
@@ -266,7 +266,7 @@ void QQuickItemGrabResult::render()
     d->image =  d->texture->toImage();
 
     delete d->texture;
-    d->texture = 0;
+    d->texture = nullptr;
 
     disconnect(d->window.data(), &QQuickWindow::beforeSynchronizing, this, &QQuickItemGrabResult::setup);
     disconnect(d->window.data(), &QQuickWindow::afterRendering, this, &QQuickItemGrabResult::render);
@@ -281,17 +281,17 @@ QQuickItemGrabResult *QQuickItemGrabResultPrivate::create(QQuickItem *item, cons
 
     if (size.width() < 1 || size.height() < 1) {
         qmlWarning(item) << "grabToImage: item has invalid dimensions";
-        return 0;
+        return nullptr;
     }
 
     if (!item->window()) {
         qmlWarning(item) << "grabToImage: item is not attached to a window";
-        return 0;
+        return nullptr;
     }
 
     if (!item->window()->isVisible()) {
         qmlWarning(item) << "grabToImage: item's window is not visible";
-        return 0;
+        return nullptr;
     }
 
     QQuickItemGrabResult *result = new QQuickItemGrabResult();
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 21aca04fdc..f2e055e874 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -54,7 +54,7 @@ Q_LOGGING_CATEGORY(lcItemViewDelegateLifecycle, "qt.quick.itemview.lifecycle")
 FxViewItem::FxViewItem(QQuickItem *i, QQuickItemView *v, bool own, QQuickItemViewAttached *attached)
     : item(i)
     , view(v)
-    , transitionableItem(0)
+    , transitionableItem(nullptr)
     , attached(attached)
     , ownItem(own)
     , releaseAfterTransition(false)
@@ -69,9 +69,9 @@ FxViewItem::~FxViewItem()
     delete transitionableItem;
     if (ownItem && item) {
         trackGeometry(false);
-        item->setParentItem(0);
+        item->setParentItem(nullptr);
         item->deleteLater();
-        item = 0;
+        item = nullptr;
     }
 }
 
@@ -275,7 +275,7 @@ QQuickItemView::~QQuickItemView()
 QQuickItem *QQuickItemView::currentItem() const
 {
     Q_D(const QQuickItemView);
-    return d->currentItem ? d->currentItem->item : 0;
+    return d->currentItem ? d->currentItem->item : nullptr;
 }
 
 QVariant QQuickItemView::model() const
@@ -304,12 +304,12 @@ void QQuickItemView::setModel(const QVariant &m)
     QQmlInstanceModel *oldModel = d->model;
 
     d->clear();
-    d->model = 0;
+    d->model = nullptr;
     d->setPosition(d->contentStartOffset());
     d->modelVariant = model;
 
     QObject *object = qvariant_cast<QObject*>(model);
-    QQmlInstanceModel *vim = 0;
+    QQmlInstanceModel *vim = nullptr;
     if (object && (vim = qobject_cast<QQmlInstanceModel *>(object))) {
         if (d->ownModel) {
             delete oldModel;
@@ -362,7 +362,7 @@ QQmlComponent *QQuickItemView::delegate() const
             return dataModel->delegate();
     }
 
-    return 0;
+    return nullptr;
 }
 
 void QQuickItemView::setDelegate(QQmlComponent *delegate)
@@ -382,7 +382,7 @@ void QQuickItemView::setDelegate(QQmlComponent *delegate)
         if (isComponentComplete()) {
             d->releaseVisibleItems();
             d->releaseItem(d->currentItem);
-            d->currentItem = 0;
+            d->currentItem = nullptr;
             d->updateSectionCriteria();
             d->refill();
             d->moveReason = QQuickItemViewPrivate::SetIndex;
@@ -586,7 +586,7 @@ QQmlComponent *QQuickItemView::header() const
 QQuickItem *QQuickItemView::headerItem() const
 {
     Q_D(const QQuickItemView);
-    return d->header ? d->header->item : 0;
+    return d->header ? d->header->item : nullptr;
 }
 
 void QQuickItemView::setHeader(QQmlComponent *headerComponent)
@@ -595,7 +595,7 @@ void QQuickItemView::setHeader(QQmlComponent *headerComponent)
     if (d->headerComponent != headerComponent) {
         d->applyPendingChanges();
         delete d->header;
-        d->header = 0;
+        d->header = nullptr;
         d->headerComponent = headerComponent;
 
         d->markExtentsDirty();
@@ -621,7 +621,7 @@ QQmlComponent *QQuickItemView::footer() const
 QQuickItem *QQuickItemView::footerItem() const
 {
     Q_D(const QQuickItemView);
-    return d->footer ? d->footer->item : 0;
+    return d->footer ? d->footer->item : nullptr;
 }
 
 void QQuickItemView::setFooter(QQmlComponent *footerComponent)
@@ -630,7 +630,7 @@ void QQuickItemView::setFooter(QQmlComponent *footerComponent)
     if (d->footerComponent != footerComponent) {
         d->applyPendingChanges();
         delete d->footer;
-        d->footer = 0;
+        d->footer = nullptr;
         d->footerComponent = footerComponent;
 
         if (isComponentComplete()) {
@@ -666,7 +666,7 @@ void QQuickItemView::setHighlight(QQmlComponent *highlightComponent)
 QQuickItem *QQuickItemView::highlightItem() const
 {
     Q_D(const QQuickItemView);
-    return d->highlight ? d->highlight->item : 0;
+    return d->highlight ? d->highlight->item : nullptr;
 }
 
 bool QQuickItemView::highlightFollowsCurrentItem() const
@@ -799,7 +799,7 @@ void QQuickItemView::setHighlightMoveDuration(int duration)
 QQuickTransition *QQuickItemView::populateTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->populateTransition : 0;
+    return d->transitioner ? d->transitioner->populateTransition : nullptr;
 }
 
 void QQuickItemView::setPopulateTransition(QQuickTransition *transition)
@@ -815,7 +815,7 @@ void QQuickItemView::setPopulateTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::addTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->addTransition : 0;
+    return d->transitioner ? d->transitioner->addTransition : nullptr;
 }
 
 void QQuickItemView::setAddTransition(QQuickTransition *transition)
@@ -831,7 +831,7 @@ void QQuickItemView::setAddTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::addDisplacedTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->addDisplacedTransition : 0;
+    return d->transitioner ? d->transitioner->addDisplacedTransition : nullptr;
 }
 
 void QQuickItemView::setAddDisplacedTransition(QQuickTransition *transition)
@@ -847,7 +847,7 @@ void QQuickItemView::setAddDisplacedTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::moveTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->moveTransition : 0;
+    return d->transitioner ? d->transitioner->moveTransition : nullptr;
 }
 
 void QQuickItemView::setMoveTransition(QQuickTransition *transition)
@@ -863,7 +863,7 @@ void QQuickItemView::setMoveTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::moveDisplacedTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->moveDisplacedTransition : 0;
+    return d->transitioner ? d->transitioner->moveDisplacedTransition : nullptr;
 }
 
 void QQuickItemView::setMoveDisplacedTransition(QQuickTransition *transition)
@@ -879,7 +879,7 @@ void QQuickItemView::setMoveDisplacedTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::removeTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->removeTransition : 0;
+    return d->transitioner ? d->transitioner->removeTransition : nullptr;
 }
 
 void QQuickItemView::setRemoveTransition(QQuickTransition *transition)
@@ -895,7 +895,7 @@ void QQuickItemView::setRemoveTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::removeDisplacedTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->removeDisplacedTransition : 0;
+    return d->transitioner ? d->transitioner->removeDisplacedTransition : nullptr;
 }
 
 void QQuickItemView::setRemoveDisplacedTransition(QQuickTransition *transition)
@@ -911,7 +911,7 @@ void QQuickItemView::setRemoveDisplacedTransition(QQuickTransition *transition)
 QQuickTransition *QQuickItemView::displacedTransition() const
 {
     Q_D(const QQuickItemView);
-    return d->transitioner ? d->transitioner->displacedTransition : 0;
+    return d->transitioner ? d->transitioner->displacedTransition : nullptr;
 }
 
 void QQuickItemView::setDisplacedTransition(QQuickTransition *transition)
@@ -1234,7 +1234,7 @@ void QQuickItemViewPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometry
         // start new transitions
         bool prevInLayout = inLayout;
         if (!inLayout) {
-            FxViewItem *actualItem = transitioner ? visibleItem(currentIndex) : 0;
+            FxViewItem *actualItem = transitioner ? visibleItem(currentIndex) : nullptr;
             if (actualItem && actualItem->transitionRunning())
                 inLayout = true;
         }
@@ -1558,14 +1558,14 @@ QQuickItemViewPrivate::QQuickItemViewPrivate()
     , layoutDirection(Qt::LeftToRight), verticalLayoutDirection(QQuickItemView::TopToBottom)
     , moveReason(Other)
     , visibleIndex(0)
-    , currentIndex(-1), currentItem(0)
-    , trackedItem(0), requestedIndex(-1)
-    , highlightComponent(0), highlight(0)
+    , currentIndex(-1), currentItem(nullptr)
+    , trackedItem(nullptr), requestedIndex(-1)
+    , highlightComponent(nullptr), highlight(nullptr)
     , highlightRange(QQuickItemView::NoHighlightRange)
     , highlightRangeStart(0), highlightRangeEnd(0)
     , highlightMoveDuration(150)
-    , headerComponent(0), header(0), footerComponent(0), footer(0)
-    , transitioner(0)
+    , headerComponent(nullptr), header(nullptr), footerComponent(nullptr), footer(nullptr)
+    , transitioner(nullptr)
     , minExtent(0), maxExtent(0)
     , ownModel(false), wrap(false)
     , keyNavigationEnabled(true)
@@ -1583,7 +1583,7 @@ QQuickItemViewPrivate::QQuickItemViewPrivate()
 QQuickItemViewPrivate::~QQuickItemViewPrivate()
 {
     if (transitioner)
-        transitioner->setChangeListener(0);
+        transitioner->setChangeListener(nullptr);
     delete transitioner;
 }
 
@@ -1649,7 +1649,7 @@ FxViewItem *QQuickItemViewPrivate::visibleItem(int modelIndex) const {
                 return item;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 // should rename to firstItemInView() to avoid confusion with other "*visible*" methods
@@ -1709,7 +1709,7 @@ void QQuickItemViewPrivate::updateCurrent(int modelIndex)
             if (currentItem->attached)
                 currentItem->attached->setIsCurrentItem(false);
             releaseItem(currentItem);
-            currentItem = 0;
+            currentItem = nullptr;
             currentIndex = modelIndex;
             emit q->currentIndexChanged();
             emit q->currentItemChanged();
@@ -1766,11 +1766,11 @@ void QQuickItemViewPrivate::clear()
 
     auto oldCurrentItem = currentItem;
     releaseItem(currentItem);
-    currentItem = 0;
+    currentItem = nullptr;
     if (oldCurrentItem)
         emit q->currentItemChanged();
     createHighlight();
-    trackedItem = 0;
+    trackedItem = nullptr;
 
     if (requestedIndex >= 0) {
         if (model)
@@ -1865,9 +1865,9 @@ void QQuickItemViewPrivate::regenerate(bool orientationChanged)
     if (q->isComponentComplete()) {
         if (orientationChanged) {
             delete header;
-            header = 0;
+            header = nullptr;
             delete footer;
-            footer = 0;
+            footer = nullptr;
         }
         clear();
         updateHeader();
@@ -2126,7 +2126,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
                 currentItem->attached->setIsCurrentItem(false);
             auto oldCurrentItem = currentItem;
             releaseItem(currentItem);
-            currentItem = 0;
+            currentItem = nullptr;
             if (oldCurrentItem)
                 emit q->currentItemChanged();
         }
@@ -2345,7 +2345,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, QQmlIncubator::Inc
     Q_Q(QQuickItemView);
 
     if (requestedIndex == modelIndex && incubationMode == QQmlIncubator::Asynchronous)
-        return 0;
+        return nullptr;
 
     for (int i=0; i<releasePendingTransition.count(); i++) {
         if (releasePendingTransition.at(i)->index == modelIndex
@@ -2377,7 +2377,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, QQmlIncubator::Inc
             }
         }
         inRequest = false;
-        return 0;
+        return nullptr;
     } else {
         item->setParentItem(q->contentItem());
         if (requestedIndex == modelIndex)
@@ -2430,7 +2430,7 @@ void QQuickItemView::destroyingItem(QObject *object)
     Q_D(QQuickItemView);
     QQuickItem* item = qmlobject_cast<QQuickItem*>(object);
     if (item) {
-        item->setParentItem(0);
+        item->setParentItem(nullptr);
         d->unrequestedItems.remove(item);
     }
 }
@@ -2441,7 +2441,7 @@ bool QQuickItemViewPrivate::releaseItem(FxViewItem *item)
     if (!item || !model)
         return true;
     if (trackedItem == item)
-        trackedItem = 0;
+        trackedItem = nullptr;
     item->trackGeometry(false);
 
     QQmlInstanceModel::ReleaseFlags flags = model->release(item->item);
@@ -2451,7 +2451,7 @@ bool QQuickItemViewPrivate::releaseItem(FxViewItem *item)
             QQuickItemPrivate::get(item->item)->setCulled(true);
             unrequestedItems.insert(item->item, model->indexOf(item->item, q));
         } else if (flags & QQmlInstanceModel::Destroyed) {
-            item->item->setParentItem(0);
+            item->item->setParentItem(nullptr);
         }
     }
     delete item;
@@ -2467,7 +2467,7 @@ QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component,
 {
     Q_Q(const QQuickItemView);
 
-    QQuickItem *item = 0;
+    QQuickItem *item = nullptr;
     if (component) {
         QQmlContext *creationContext = component->creationContext();
         QQmlContext *context = new QQmlContext(
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index b38bc6174f..483fc1a09f 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -128,7 +128,7 @@ public:
     };
     Q_ENUM(VerticalLayoutDirection)
 
-    QQuickItemView(QQuickFlickablePrivate &dd, QQuickItem *parent = 0);
+    QQuickItemView(QQuickFlickablePrivate &dd, QQuickItem *parent = nullptr);
     ~QQuickItemView();
 
     QVariant model() const;
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 745e5b275f..5cd28d0acb 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -69,11 +69,11 @@ protected:
 
 
 QQuickItemViewTransitionJob::QQuickItemViewTransitionJob()
-    : m_transitioner(0)
-    , m_item(0)
+    : m_transitioner(nullptr)
+    , m_item(nullptr)
     , m_type(QQuickItemViewTransitioner::NoTransition)
     , m_isTarget(false)
-    , m_wasDeleted(0)
+    , m_wasDeleted(nullptr)
 {
 }
 
@@ -143,12 +143,12 @@ void QQuickItemViewTransitionJob::finished()
         m_transitioner->finishedTransition(this, m_item);
         if (deleted)
             return;
-        m_wasDeleted = 0;
+        m_wasDeleted = nullptr;
 
-        m_transitioner = 0;
+        m_transitioner = nullptr;
     }
 
-    m_item = 0;
+    m_item = nullptr;
     m_toPos.setX(0);
     m_toPos.setY(0);
     m_type = QQuickItemViewTransitioner::NoTransition;
@@ -157,12 +157,12 @@ void QQuickItemViewTransitionJob::finished()
 
 
 QQuickItemViewTransitioner::QQuickItemViewTransitioner()
-    : populateTransition(0)
-    , addTransition(0), addDisplacedTransition(0)
-    , moveTransition(0), moveDisplacedTransition(0)
-    , removeTransition(0), removeDisplacedTransition(0)
-    , displacedTransition(0)
-    , changeListener(0)
+    : populateTransition(nullptr)
+    , addTransition(nullptr), addDisplacedTransition(nullptr)
+    , moveTransition(nullptr), moveDisplacedTransition(nullptr)
+    , removeTransition(nullptr), removeDisplacedTransition(nullptr)
+    , displacedTransition(nullptr)
+    , changeListener(nullptr)
     , usePopulateTransition(false)
 {
 }
@@ -172,7 +172,7 @@ QQuickItemViewTransitioner::~QQuickItemViewTransitioner()
     typedef QSet<QQuickItemViewTransitionJob *>::iterator JobIt;
 
     for (JobIt it = runningJobs.begin(), end = runningJobs.end(); it != end; ++it)
-        (*it)->m_transitioner = 0;
+        (*it)->m_transitioner = nullptr;
 }
 
 bool QQuickItemViewTransitioner::canTransition(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const
@@ -249,12 +249,12 @@ void QQuickItemViewTransitioner::resetTargetLists()
 QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const
 {
     if (type == QQuickItemViewTransitioner::NoTransition)
-        return 0;
+        return nullptr;
 
     if (type == PopulateTransition)
         asTarget = true;    // no separate displaced transition
 
-    QQuickTransition *trans = 0;
+    QQuickTransition *trans = nullptr;
     switch (type) {
     case NoTransition:
         break;
@@ -276,7 +276,7 @@ QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTra
         trans = displacedTransition;
     if (trans && trans->enabled())
         return trans;
-    return 0;
+    return nullptr;
 }
 
 const QList<int> &QQuickItemViewTransitioner::targetIndexes(QQuickItemViewTransitioner::TransitionType type) const
@@ -328,7 +328,7 @@ void QQuickItemViewTransitioner::finishedTransition(QQuickItemViewTransitionJob
 
 QQuickItemViewTransitionableItem::QQuickItemViewTransitionableItem(QQuickItem *i)
     : item(i)
-    , transition(0)
+    , transition(nullptr)
     , nextTransitionType(QQuickItemViewTransitioner::NoTransition)
     , isTransitionTarget(false)
     , nextTransitionToSet(false)
@@ -563,7 +563,7 @@ void QQuickItemViewTransitionableItem::stopTransition()
 
 
 QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
-    : QObject(parent), m_item(0), m_index(-1)
+    : QObject(parent), m_item(nullptr), m_index(-1)
 {
 }
 /*!
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 54dfbafaa2..33becd71ec 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -176,9 +176,9 @@ public:
         , snapMode(QQuickListView::NoSnap)
         , headerPositioning(QQuickListView::InlineHeader)
         , footerPositioning(QQuickListView::InlineFooter)
-        , highlightPosAnimator(0), highlightWidthAnimator(0), highlightHeightAnimator(0)
+        , highlightPosAnimator(nullptr), highlightWidthAnimator(nullptr), highlightHeightAnimator(nullptr)
         , highlightMoveVelocity(400), highlightResizeVelocity(400), highlightResizeDuration(-1)
-        , sectionCriteria(0), currentSectionItem(0), nextSectionItem(0)
+        , sectionCriteria(nullptr), currentSectionItem(nullptr), nextSectionItem(nullptr)
         , overshootDist(0.0), correctFlick(false), inFlickCorrection(false)
     {
         highlightMoveDuration = -1; //override default value set in base class
@@ -195,8 +195,8 @@ public:
 //----------------------------------------------------------------------------
 
 QQuickViewSection::QQuickViewSection(QQuickListView *parent)
-    : QObject(parent), m_criteria(FullString), m_delegate(0), m_labelPositioning(InlineLabels)
-    , m_view(parent ? QQuickListViewPrivate::get(parent) : 0)
+    : QObject(parent), m_criteria(FullString), m_delegate(nullptr), m_labelPositioning(InlineLabels)
+    , m_view(parent ? QQuickListViewPrivate::get(parent) : nullptr)
 {
 }
 
@@ -258,7 +258,7 @@ public:
     }
 
     inline QQuickItem *section() const {
-        return item && attached ? static_cast<QQuickListViewAttached*>(attached)->m_sectionItem : 0;
+        return item && attached ? static_cast<QQuickListViewAttached*>(attached)->m_sectionItem : nullptr;
     }
     void setSection(QQuickItem *s) {
         static_cast<QQuickListViewAttached*>(attached)->m_sectionItem = s;
@@ -389,7 +389,7 @@ bool QQuickListViewPrivate::isBottomToTop() const
 FxViewItem *QQuickListViewPrivate::itemBefore(int modelIndex) const
 {
     if (modelIndex < visibleIndex)
-        return 0;
+        return nullptr;
     int idx = 1;
     int lastIndex = -1;
     while (idx < visibleItems.count()) {
@@ -402,7 +402,7 @@ FxViewItem *QQuickListViewPrivate::itemBefore(int modelIndex) const
     }
     if (lastIndex == modelIndex-1)
         return visibleItems.constLast();
-    return 0;
+    return nullptr;
 }
 
 void QQuickListViewPrivate::setPosition(qreal pos)
@@ -530,7 +530,7 @@ qreal QQuickListViewPrivate::snapPosAt(qreal pos)
 
 FxViewItem *QQuickListViewPrivate::snapItemAt(qreal pos)
 {
-    FxViewItem *snapItem = 0;
+    FxViewItem *snapItem = nullptr;
     qreal prevItemSize = 0;
     for (FxViewItem *item : qAsConst(visibleItems)) {
         if (item->index == -1)
@@ -561,13 +561,13 @@ void QQuickListViewPrivate::clear()
 {
     for (int i = 0; i < sectionCacheSize; ++i) {
         delete sectionCache[i];
-        sectionCache[i] = 0;
+        sectionCache[i] = nullptr;
     }
     visiblePos = 0;
     releaseSectionItem(currentSectionItem);
-    currentSectionItem = 0;
+    currentSectionItem = nullptr;
     releaseSectionItem(nextSectionItem);
-    nextSectionItem = 0;
+    nextSectionItem = nullptr;
     lastVisibleSection = QString();
     QQuickItemViewPrivate::clear();
 }
@@ -629,13 +629,13 @@ bool QQuickListViewPrivate::releaseItem(FxViewItem *item)
             if (!sectionCache[i]) {
                 sectionCache[i] = att->m_sectionItem;
                 sectionCache[i]->setVisible(false);
-                att->m_sectionItem = 0;
+                att->m_sectionItem = nullptr;
                 break;
             }
             ++i;
         } while (i < sectionCacheSize);
         delete att->m_sectionItem;
-        att->m_sectionItem = 0;
+        att->m_sectionItem = nullptr;
     }
 
     return released;
@@ -672,7 +672,7 @@ bool QQuickListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal
     QQmlIncubator::IncubationMode incubationMode = doBuffer ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested;
 
     bool changed = false;
-    FxListItemSG *item = 0;
+    FxListItemSG *item = nullptr;
     qreal pos = itemEnd;
     while (modelIndex < model->count() && pos <= fillTo) {
         if (!(item = static_cast<FxListItemSG*>(createItem(modelIndex, incubationMode))))
@@ -722,7 +722,7 @@ void QQuickListViewPrivate::removeItem(FxViewItem *item)
 
 bool QQuickListViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
 {
-    FxViewItem *item = 0;
+    FxViewItem *item = nullptr;
     bool changed = false;
 
     // Remove items from the start of the view.
@@ -864,16 +864,16 @@ void QQuickListViewPrivate::createHighlight()
     bool changed = false;
     if (highlight) {
         if (trackedItem == highlight)
-            trackedItem = 0;
+            trackedItem = nullptr;
         delete highlight;
-        highlight = 0;
+        highlight = nullptr;
 
         delete highlightPosAnimator;
         delete highlightWidthAnimator;
         delete highlightHeightAnimator;
-        highlightPosAnimator = 0;
-        highlightWidthAnimator = 0;
-        highlightHeightAnimator = 0;
+        highlightPosAnimator = nullptr;
+        highlightWidthAnimator = nullptr;
+        highlightHeightAnimator = nullptr;
 
         changed = true;
     }
@@ -962,13 +962,13 @@ bool QQuickListViewPrivate::movingFromHighlight()
 QQuickItem * QQuickListViewPrivate::getSectionItem(const QString &section)
 {
     Q_Q(QQuickListView);
-    QQuickItem *sectionItem = 0;
+    QQuickItem *sectionItem = nullptr;
     int i = sectionCacheSize-1;
     while (i >= 0 && !sectionCache[i])
         --i;
     if (i >= 0) {
         sectionItem = sectionCache[i];
-        sectionCache[i] = 0;
+        sectionCache[i] = nullptr;
         sectionItem->setVisible(true);
         QQmlContext *context = QQmlEngine::contextForObject(sectionItem)->parentContext();
         context->setContextProperty(QLatin1String("section"), section);
@@ -1025,13 +1025,13 @@ void QQuickListViewPrivate::releaseSectionItems()
         if (listItem->section()) {
             qreal pos = listItem->position();
             releaseSectionItem(listItem->section());
-            listItem->setSection(0);
+            listItem->setSection(nullptr);
             listItem->setPosition(pos);
         }
     }
     for (int i = 0; i < sectionCacheSize; ++i) {
         delete sectionCache[i];
-        sectionCache[i] = 0;
+        sectionCache[i] = nullptr;
     }
 }
 
@@ -1053,7 +1053,7 @@ void QQuickListViewPrivate::updateInlineSection(FxListItemSG *listItem)
     } else if (listItem->section()) {
         qreal pos = listItem->position();
         releaseSectionItem(listItem->section());
-        listItem->setSection(0);
+        listItem->setSection(nullptr);
         listItem->setPosition(pos);
     }
 }
@@ -1069,8 +1069,8 @@ void QQuickListViewPrivate::updateStickySections()
     qreal startPos = hasStickyHeader() ? header->endPosition() : viewPos;
     qreal endPos = hasStickyFooter() ? footer->position() : viewPos + size();
 
-    QQuickItem *sectionItem = 0;
-    QQuickItem *lastSectionItem = 0;
+    QQuickItem *sectionItem = nullptr;
+    QQuickItem *lastSectionItem = nullptr;
     int index = 0;
     while (index < visibleItems.count()) {
         if (QQuickItem *section = static_cast<FxListItemSG *>(visibleItems.at(index))->section()) {
@@ -1129,7 +1129,7 @@ void QQuickListViewPrivate::updateStickySections()
             currentSectionItem->setX(pos);
     } else if (currentSectionItem) {
         releaseSectionItem(currentSectionItem);
-        currentSectionItem = 0;
+        currentSectionItem = nullptr;
     }
 
     // Next section footer
@@ -1161,7 +1161,7 @@ void QQuickListViewPrivate::updateStickySections()
             nextSectionItem->setX(pos);
     } else if (nextSectionItem) {
         releaseSectionItem(nextSectionItem);
-        nextSectionItem = 0;
+        nextSectionItem = nullptr;
     }
 }
 
@@ -1177,7 +1177,7 @@ void QQuickListViewPrivate::updateSections()
         QString prevSection;
         if (visibleIndex > 0)
             prevSection = sectionAt(visibleIndex-1);
-        QQuickListViewAttached *prevAtt = 0;
+        QQuickListViewAttached *prevAtt = nullptr;
         int prevIdx = -1;
         int idx = -1;
         for (FxViewItem *item : qAsConst(visibleItems)) {
@@ -3266,7 +3266,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
         } else {
             for (i = count-1; i >= 0 && pos >= from; --i) {
                 // item is before first visible e.g. in cache buffer
-                FxViewItem *item = 0;
+                FxViewItem *item = nullptr;
                 if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                     item->index = modelIndex + i;
                 if (!item)
@@ -3307,7 +3307,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
     } else {
         for (int i = 0; i < count && pos <= lastVisiblePos; ++i) {
             visibleAffected = true;
-            FxViewItem *item = 0;
+            FxViewItem *item = nullptr;
             if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                 item->index = modelIndex + i;
             bool newItem = !item;
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index f8db0f0f8f..9a9b325b1e 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -71,7 +71,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickViewSection : public QObject
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int labelPositioning READ labelPositioning WRITE setLabelPositioning NOTIFY labelPositioningChanged)
 public:
-    QQuickViewSection(QQuickListView *parent=0);
+    QQuickViewSection(QQuickListView *parent=nullptr);
 
     QString property() const { return m_property; }
     void setProperty(const QString &);
@@ -132,7 +132,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickListView : public QQuickItemView
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
-    QQuickListView(QQuickItem *parent=0);
+    QQuickListView(QQuickItem *parent=nullptr);
     ~QQuickListView();
 
     qreal spacing() const;
@@ -206,7 +206,7 @@ class QQuickListViewAttached : public QQuickItemViewAttached
 
 public:
     QQuickListViewAttached(QObject *parent)
-        : QQuickItemViewAttached(parent), m_sectionItem(0) {}
+        : QQuickItemViewAttached(parent), m_sectionItem(nullptr) {}
     ~QQuickListViewAttached() {}
 
 public:
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 33e22c1e95..34f30e81a3 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -54,7 +54,7 @@ static const QQuickItemPrivate::ChangeTypes watchedChanges
     = QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight;
 
 QQuickLoaderPrivate::QQuickLoaderPrivate()
-    : item(0), object(0), component(0), itemContext(0), incubator(0), updatingSize(false),
+    : item(nullptr), object(nullptr), component(nullptr), itemContext(nullptr), incubator(nullptr), updatingSize(false),
       active(true), loadingFromSource(false), asynchronous(false)
 {
 }
@@ -62,7 +62,7 @@ QQuickLoaderPrivate::QQuickLoaderPrivate()
 QQuickLoaderPrivate::~QQuickLoaderPrivate()
 {
     delete itemContext;
-    itemContext = 0;
+    itemContext = nullptr;
     delete incubator;
     disposeInitialPropertyValues();
 }
@@ -96,7 +96,7 @@ void QQuickLoaderPrivate::clear()
         incubator->clear();
 
     delete itemContext;
-    itemContext = 0;
+    itemContext = nullptr;
 
     // Prevent any bindings from running while waiting for deletion. Without
     // this we may get transient errors from use of 'parent', for example.
@@ -111,7 +111,7 @@ void QQuickLoaderPrivate::clear()
         QObject::disconnect(component, SIGNAL(progressChanged(qreal)),
                 q, SIGNAL(progressChanged()));
         component->deleteLater();
-        component = 0;
+        component = nullptr;
     }
     componentStrongReference.clear();
     source = QUrl();
@@ -122,13 +122,13 @@ void QQuickLoaderPrivate::clear()
 
         // We can't delete immediately because our item may have triggered
         // the Loader to load a different item.
-        item->setParentItem(0);
+        item->setParentItem(nullptr);
         item->setVisible(false);
-        item = 0;
+        item = nullptr;
     }
     if (object) {
         object->deleteLater();
-        object = 0;
+        object = nullptr;
     }
 }
 
@@ -356,7 +356,7 @@ void QQuickLoader::setActive(bool newVal)
         if (d->incubator) {
             d->incubator->clear();
             delete d->itemContext;
-            d->itemContext = 0;
+            d->itemContext = nullptr;
         }
 
         // Prevent any bindings from running while waiting for deletion. Without
@@ -371,13 +371,13 @@ void QQuickLoader::setActive(bool newVal)
 
             // We can't delete immediately because our item may have triggered
             // the Loader to load a different item.
-            d->item->setParentItem(0);
+            d->item->setParentItem(nullptr);
             d->item->setVisible(false);
-            d->item = 0;
+            d->item = nullptr;
         }
         if (d->object) {
             d->object->deleteLater();
-            d->object = 0;
+            d->object = nullptr;
             emit itemChanged();
         }
         emit statusChanged();
@@ -499,7 +499,7 @@ void QQuickLoader::setSourceComponent(QQmlComponent *comp)
 
 void QQuickLoader::resetSourceComponent()
 {
-    setSourceComponent(0);
+    setSourceComponent(nullptr);
 }
 
 void QQuickLoader::loadFromSourceComponent()
@@ -656,7 +656,7 @@ void QQuickLoaderPrivate::setInitialState(QObject *obj)
     if (obj) {
         QQml_setParent_noEvent(itemContext, obj);
         QQml_setParent_noEvent(obj, q);
-        itemContext = 0;
+        itemContext = nullptr;
     }
 
     if (initialPropertyValues.isUndefined())
@@ -700,7 +700,7 @@ void QQuickLoaderPrivate::incubatorStateChanged(QQmlIncubator::Status status)
         if (!incubator->errors().isEmpty())
             QQmlEnginePrivate::warning(qmlEngine(q), incubator->errors());
         delete itemContext;
-        itemContext = 0;
+        itemContext = nullptr;
         delete incubator->object();
         source = QUrl();
         emit q->itemChanged();
diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h
index b5137c0783..de1dfa9da5 100644
--- a/src/quick/items/qquickloader_p.h
+++ b/src/quick/items/qquickloader_p.h
@@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
 
 public:
-    QQuickLoader(QQuickItem *parent = 0);
+    QQuickLoader(QQuickItem *parent = nullptr);
     virtual ~QQuickLoader();
 
     bool active() const;
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index cea8293ceb..052da9fe82 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -60,13 +60,13 @@ Q_DECLARE_LOGGING_CATEGORY(DBG_HOVER_TRACE)
 QQuickMouseAreaPrivate::QQuickMouseAreaPrivate()
 : enabled(true), scrollGestureEnabled(true), hovered(false), longPress(false),
   moved(false), stealMouse(false), doubleClick(false), preventStealing(false),
-  propagateComposedEvents(false), overThreshold(false), pressed(0),
+  propagateComposedEvents(false), overThreshold(false), pressed(nullptr),
   pressAndHoldInterval(-1)
 #if QT_CONFIG(draganddrop)
-  , drag(0)
+  , drag(nullptr)
 #endif
 #if QT_CONFIG(cursor)
-  , cursor(0)
+  , cursor(nullptr)
 #endif
 {
 }
@@ -910,7 +910,7 @@ void QQuickMouseArea::ungrabMouse()
     if (d->pressed) {
         // if our mouse grab has been removed (probably by Flickable), fix our
         // state
-        d->pressed = 0;
+        d->pressed = nullptr;
         d->stealMouse = false;
         d->doubleClick = false;
         d->overThreshold = false;
@@ -944,7 +944,7 @@ bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event)
     QPointF localPos = mapFromScene(event->windowPos());
 
     QQuickWindow *c = window();
-    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr;
     bool stealThisEvent = d->stealMouse;
     if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab())) {
         QMouseEvent mouseEvent(event->type(), localPos, event->windowPos(), event->screenPos(),
@@ -965,7 +965,7 @@ bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event)
         default:
             break;
         }
-        grabber = c ? c->mouseGrabberItem() : 0;
+        grabber = c ? c->mouseGrabberItem() : nullptr;
         if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this)
             grabMouse();
 
@@ -1420,7 +1420,7 @@ QSGNode *QQuickMouseArea::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     Q_D(QQuickMouseArea);
 
     if (!qmlVisualTouchDebugging())
-        return 0;
+        return nullptr;
 
     QSGInternalRectangleNode *rectangle = static_cast<QSGInternalRectangleNode *>(oldNode);
     if (!rectangle) rectangle = d->sceneGraphContext()->createInternalRectangleNode();
diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h
index ae6c56726e..0a8449957f 100644
--- a/src/quick/items/qquickmousearea_p.h
+++ b/src/quick/items/qquickmousearea_p.h
@@ -87,7 +87,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickMouseArea : public QQuickItem
     Q_PROPERTY(int pressAndHoldInterval READ pressAndHoldInterval WRITE setPressAndHoldInterval NOTIFY pressAndHoldIntervalChanged RESET resetPressAndHoldInterval REVISION 9)
 
 public:
-    QQuickMouseArea(QQuickItem *parent=0);
+    QQuickMouseArea(QQuickItem *parent=nullptr);
     ~QQuickMouseArea();
 
     qreal mouseX() const;
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index 514d0f5d37..dc168073e4 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -541,7 +541,7 @@ void QQuickMultiPointTouchArea::touchEvent(QTouchEvent *event)
     case QEvent::TouchEnd: {
         //if e.g. a parent Flickable has the mouse grab, don't process the touch events
         QQuickWindow *c = window();
-        QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
+        QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr;
         if (grabber && grabber != this && grabber->keepMouseGrab() && grabber->isEnabled()) {
             QQuickItem *item = this;
             while ((item = item->parentItem())) {
@@ -719,7 +719,7 @@ void QQuickMultiPointTouchArea::clearTouchLists()
 
 void QQuickMultiPointTouchArea::addTouchPoint(const QTouchEvent::TouchPoint *p)
 {
-    QQuickTouchPoint *dtp = 0;
+    QQuickTouchPoint *dtp = nullptr;
     for (QQuickTouchPoint* tp : qAsConst(_touchPrototypes)) {
         if (!tp->inUse()) {
             tp->setInUse(true);
@@ -728,7 +728,7 @@ void QQuickMultiPointTouchArea::addTouchPoint(const QTouchEvent::TouchPoint *p)
         }
     }
 
-    if (dtp == 0)
+    if (dtp == nullptr)
         dtp = new QQuickTouchPoint(false);
     dtp->setPointId(p->id());
     updateTouchPoint(dtp,p);
@@ -739,7 +739,7 @@ void QQuickMultiPointTouchArea::addTouchPoint(const QTouchEvent::TouchPoint *p)
 
 void QQuickMultiPointTouchArea::addTouchPoint(const QMouseEvent *e)
 {
-    QQuickTouchPoint *dtp = 0;
+    QQuickTouchPoint *dtp = nullptr;
     for (QQuickTouchPoint *tp : qAsConst(_touchPrototypes))
         if (!tp->inUse()) {
             tp->setInUse(true);
@@ -747,7 +747,7 @@ void QQuickMultiPointTouchArea::addTouchPoint(const QMouseEvent *e)
             break;
         }
 
-    if (dtp == 0)
+    if (dtp == nullptr)
         dtp = new QQuickTouchPoint(false);
     updateTouchPoint(dtp, e);
     dtp->setPressed(true);
@@ -920,7 +920,7 @@ bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event)
     QPointF localPos = mapFromScene(event->windowPos());
 
     QQuickWindow *c = window();
-    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr;
     bool stealThisEvent = _stealMouse;
     if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab())) {
         QMouseEvent mouseEvent(event->type(), localPos, event->windowPos(), event->screenPos(),
@@ -944,7 +944,7 @@ bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event)
         default:
             break;
         }
-        grabber = c ? c->mouseGrabberItem() : 0;
+        grabber = c ? c->mouseGrabberItem() : nullptr;
         if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this)
             grabMouse();
 
@@ -991,7 +991,7 @@ bool QQuickMultiPointTouchArea::childMouseEventFilter(QQuickItem *receiver, QEve
 bool QQuickMultiPointTouchArea::shouldFilter(QEvent *event)
 {
     QQuickWindow *c = window();
-    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr;
     bool disabledItem = grabber && !grabber->isEnabled();
     bool stealThisEvent = _stealMouse;
     bool containsPoint = false;
@@ -1032,7 +1032,7 @@ QSGNode *QQuickMultiPointTouchArea::updatePaintNode(QSGNode *oldNode, UpdatePain
     Q_UNUSED(data);
 
     if (!qmlVisualTouchDebugging())
-        return 0;
+        return nullptr;
 
     QSGInternalRectangleNode *rectangle = static_cast<QSGInternalRectangleNode *>(oldNode);
     if (!rectangle) rectangle = QQuickItemPrivate::get(this)->sceneGraphContext()->createInternalRectangleNode();
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 64fe81563d..a6acdfc97d 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -224,7 +224,7 @@ class Q_AUTOTEST_EXPORT QQuickMultiPointTouchArea : public QQuickItem
     Q_PROPERTY(bool mouseEnabled READ mouseEnabled WRITE setMouseEnabled NOTIFY mouseEnabledChanged)
 
 public:
-    QQuickMultiPointTouchArea(QQuickItem *parent=0);
+    QQuickMultiPointTouchArea(QQuickItem *parent=nullptr);
     ~QQuickMultiPointTouchArea();
 
     int minimumTouchPoints() const;
@@ -235,7 +235,7 @@ public:
     void setMouseEnabled(bool arg);
 
     QQmlListProperty<QQuickTouchPoint> touchPoints() {
-        return QQmlListProperty<QQuickTouchPoint>(this, 0, QQuickMultiPointTouchArea::touchPoint_append, QQuickMultiPointTouchArea::touchPoint_count, QQuickMultiPointTouchArea::touchPoint_at, 0);
+        return QQmlListProperty<QQuickTouchPoint>(this, nullptr, QQuickMultiPointTouchArea::touchPoint_append, QQuickMultiPointTouchArea::touchPoint_count, QQuickMultiPointTouchArea::touchPoint_at, nullptr);
     }
 
     static void touchPoint_append(QQmlListProperty<QQuickTouchPoint> *list, QQuickTouchPoint* touch) {
diff --git a/src/quick/items/qquickopenglinfo.cpp b/src/quick/items/qquickopenglinfo.cpp
index 7f5364031a..73f9c85e94 100644
--- a/src/quick/items/qquickopenglinfo.cpp
+++ b/src/quick/items/qquickopenglinfo.cpp
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
  */
 QQuickOpenGLInfo::QQuickOpenGLInfo(QQuickItem *item)
     : QObject(item)
-    , m_window(0)
+    , m_window(nullptr)
     , m_majorVersion(2)
     , m_minorVersion(0)
     , m_profile(NoProfile)
@@ -150,12 +150,12 @@ QQuickOpenGLInfo *QQuickOpenGLInfo::qmlAttachedProperties(QObject *object)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem *>(object))
         return new QQuickOpenGLInfo(item);
-    return 0;
+    return nullptr;
 }
 
 void QQuickOpenGLInfo::updateFormat()
 {
-    QOpenGLContext *context = 0;
+    QOpenGLContext *context = nullptr;
     if (m_window)
         context = m_window->openglContext();
     QSurfaceFormat format = context ? context->format() : QSurfaceFormat::defaultFormat();
diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp
index 3194aa3cd0..cad598d2c0 100644
--- a/src/quick/items/qquickopenglshadereffect.cpp
+++ b/src/quick/items/qquickopenglshadereffect.cpp
@@ -484,7 +484,7 @@ void QQuickOpenGLShaderEffectCommon::updateMaterial(QQuickOpenGLShaderEffectNode
                 if (d.specialType != UniformData::Sampler && d.specialType != UniformData::SamplerExternal)
                     continue;
                 QSGTextureProvider *oldProvider = material->textureProviders.at(index);
-                QSGTextureProvider *newProvider = 0;
+                QSGTextureProvider *newProvider = nullptr;
                 QQuickItem *source = qobject_cast<QQuickItem *>(qvariant_cast<QObject *>(d.value));
                 if (source && source->isTextureProvider())
                     newProvider = source->textureProvider();
@@ -624,7 +624,7 @@ QQuickOpenGLShaderEffect::QQuickOpenGLShaderEffect(QQuickShaderEffect *item, QOb
     , m_item(item)
     , m_itemMetaObject(nullptr)
     , m_meshResolution(1, 1)
-    , m_mesh(0)
+    , m_mesh(nullptr)
     , m_cullMode(QQuickShaderEffect::NoCulling)
     , m_status(QQuickShaderEffect::Uncompiled)
     , m_common(this, [this](int mappedId){this->propertyChanged(mappedId);})
@@ -713,7 +713,7 @@ void QQuickOpenGLShaderEffect::setMesh(const QVariant &mesh)
     if (newMesh && newMesh == m_mesh)
         return;
     if (m_mesh)
-        disconnect(m_mesh, SIGNAL(geometryChanged()), this, 0);
+        disconnect(m_mesh, SIGNAL(geometryChanged()), this, nullptr);
     m_mesh = newMesh;
     if (m_mesh) {
         connect(m_mesh, SIGNAL(geometryChanged()), this, SLOT(updateGeometry()));
@@ -766,7 +766,7 @@ QString QQuickOpenGLShaderEffect::parseLog()
     maybeUpdateShaders(true);
 
     if (m_dirtyParseLog) {
-        m_common.updateParseLog(m_mesh != 0);
+        m_common.updateParseLog(m_mesh != nullptr);
         m_dirtyParseLog = false;
     }
     return m_common.parseLog;
@@ -838,7 +838,7 @@ QSGNode *QQuickOpenGLShaderEffect::handleUpdatePaintNode(QSGNode *oldNode, QQuic
     if (m_common.attributes.isEmpty() || m_item->width() <= 0 || m_item->height() <= 0) {
         if (node)
             delete node;
-        return 0;
+        return nullptr;
     }
 
     if (!node) {
@@ -914,7 +914,7 @@ QSGNode *QQuickOpenGLShaderEffect::handleUpdatePaintNode(QSGNode *oldNode, QQuic
     }
 
     if (m_dirtyMesh) {
-        node->setGeometry(0);
+        node->setGeometry(nullptr);
         m_dirtyMesh = false;
         m_dirtyGeometry = true;
     }
@@ -935,7 +935,7 @@ QSGNode *QQuickOpenGLShaderEffect::handleUpdatePaintNode(QSGNode *oldNode, QQuic
                 emit m_item->statusChanged();
             }
             delete node;
-            return 0;
+            return nullptr;
         }
 
         geometry = mesh->updateGeometry(geometry, m_common.attributes.count(), posIndex, srcRect, rect);
diff --git a/src/quick/items/qquickopenglshadereffect_p.h b/src/quick/items/qquickopenglshadereffect_p.h
index bc2e2975ee..3d1d8c426c 100644
--- a/src/quick/items/qquickopenglshadereffect_p.h
+++ b/src/quick/items/qquickopenglshadereffect_p.h
@@ -120,7 +120,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickOpenGLShaderEffect : public QObject
     Q_OBJECT
 
 public:
-    QQuickOpenGLShaderEffect(QQuickShaderEffect *item, QObject *parent = 0);
+    QQuickOpenGLShaderEffect(QQuickShaderEffect *item, QObject *parent = nullptr);
     ~QQuickOpenGLShaderEffect();
 
     QByteArray fragmentShader() const { return m_common.source.sourceCode[Key::FragmentShader]; }
diff --git a/src/quick/items/qquickopenglshadereffectnode.cpp b/src/quick/items/qquickopenglshadereffectnode.cpp
index a6431135eb..d51419a275 100644
--- a/src/quick/items/qquickopenglshadereffectnode.cpp
+++ b/src/quick/items/qquickopenglshadereffectnode.cpp
@@ -111,7 +111,7 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri
 {
     typedef QQuickOpenGLShaderEffectMaterial::UniformData UniformData;
 
-    Q_ASSERT(newEffect != 0);
+    Q_ASSERT(newEffect != nullptr);
 
     QQuickOpenGLShaderEffectMaterial *material = static_cast<QQuickOpenGLShaderEffectMaterial *>(newEffect);
     if (!material->m_emittedLogChanged && material->m_node) {
@@ -239,7 +239,7 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri
     functions->glActiveTexture(GL_TEXTURE0);
 
     const QQuickOpenGLShaderEffectMaterial *oldMaterial = static_cast<const QQuickOpenGLShaderEffectMaterial *>(oldEffect);
-    if (oldEffect == 0 || material->cullMode != oldMaterial->cullMode) {
+    if (oldEffect == nullptr || material->cullMode != oldMaterial->cullMode) {
         switch (material->cullMode) {
         case QQuickShaderEffect::FrontFaceCulling:
             functions->glEnable(GL_CULL_FACE);
diff --git a/src/quick/items/qquickopenglshadereffectnode_p.h b/src/quick/items/qquickopenglshadereffectnode_p.h
index 68eece7660..029533ac9d 100644
--- a/src/quick/items/qquickopenglshadereffectnode_p.h
+++ b/src/quick/items/qquickopenglshadereffectnode_p.h
@@ -109,7 +109,7 @@ public:
         }
     };
 
-    explicit QQuickOpenGLShaderEffectMaterial(QQuickOpenGLShaderEffectNode *node = 0);
+    explicit QQuickOpenGLShaderEffectMaterial(QQuickOpenGLShaderEffectNode *node = nullptr);
     QSGMaterialType *type() const override;
     QSGMaterialShader *createShader() const override;
     int compare(const QSGMaterial *other) const override;
diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp
index 34d71f00e8..197c4c6348 100644
--- a/src/quick/items/qquickpainteditem.cpp
+++ b/src/quick/items/qquickpainteditem.cpp
@@ -53,7 +53,7 @@ class QQuickPaintedItemTextureProvider : public QSGTextureProvider
 {
 public:
     QSGPainterNode *node;
-    QSGTexture *texture() const override { return node ? node->texture() : 0; }
+    QSGTexture *texture() const override { return node ? node->texture() : nullptr; }
     void fireTextureChanged() { emit textureChanged(); }
 };
 
@@ -133,12 +133,12 @@ QQuickPaintedItemPrivate::QQuickPaintedItemPrivate()
     , contentsScale(1.0)
     , fillColor(Qt::transparent)
     , renderTarget(QQuickPaintedItem::Image)
-    , performanceHints(0)
+    , performanceHints(nullptr)
     , opaquePainting(false)
     , antialiasing(false)
     , mipmap(false)
-    , textureProvider(0)
-    , node(0)
+    , textureProvider(nullptr)
+    , node(nullptr)
 {
 }
 
@@ -566,10 +566,10 @@ QSGNode *QQuickPaintedItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat
     if (width() <= 0 || height() <= 0) {
         delete oldNode;
         if (d->textureProvider) {
-            d->textureProvider->node = 0;
+            d->textureProvider->node = nullptr;
             d->textureProvider->fireTextureChanged();
         }
-        return 0;
+        return nullptr;
     }
 
     QSGPainterNode *node = static_cast<QSGPainterNode *>(oldNode);
@@ -628,17 +628,17 @@ void QQuickPaintedItem::releaseResources()
     Q_D(QQuickPaintedItem);
     if (d->textureProvider) {
         QQuickWindowQObjectCleanupJob::schedule(window(), d->textureProvider);
-        d->textureProvider = 0;
+        d->textureProvider = nullptr;
     }
-    d->node = 0; // Managed by the scene graph, just clear the pointer.
+    d->node = nullptr; // Managed by the scene graph, just clear the pointer.
 }
 
 void QQuickPaintedItem::invalidateSceneGraph()
 {
     Q_D(QQuickPaintedItem);
     delete d->textureProvider;
-    d->textureProvider = 0;
-    d->node = 0; // Managed by the scene graph, just clear the pointer
+    d->textureProvider = nullptr;
+    d->node = nullptr; // Managed by the scene graph, just clear the pointer
 }
 
 /*!
@@ -666,7 +666,7 @@ QSGTextureProvider *QQuickPaintedItem::textureProvider() const
     QQuickWindow *w = window();
     if (!w || !w->openglContext() || QThread::currentThread() != w->openglContext()->thread()) {
         qWarning("QQuickPaintedItem::textureProvider: can only be queried on the rendering thread of an exposed window");
-        return 0;
+        return nullptr;
     }
 #endif
     if (!d->textureProvider)
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index b9fea974ce..be94cdef42 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -66,7 +66,7 @@ const qreal MinimumFlickVelocity = 75.0;
 static QQmlOpenMetaObjectType *qPathViewAttachedType = nullptr;
 
 QQuickPathViewAttached::QQuickPathViewAttached(QObject *parent)
-: QObject(parent), m_percent(-1), m_view(0), m_onPath(false), m_isCurrent(false)
+: QObject(parent), m_percent(-1), m_view(nullptr), m_onPath(false), m_isCurrent(false)
 {
     if (qPathViewAttachedType) {
         m_metaobject = new QQmlOpenMetaObject(this, qPathViewAttachedType);
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 9f10705449..7ae0f9b7e3 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QQuickPinch::QQuickPinch()
-    : m_target(0), m_minScale(1.0), m_maxScale(1.0)
+    : m_target(nullptr), m_minScale(1.0), m_maxScale(1.0)
     , m_minRotation(0.0), m_maxRotation(0.0)
     , m_axis(NoDrag), m_xmin(-FLT_MAX), m_xmax(FLT_MAX)
     , m_ymin(-FLT_MAX), m_ymax(FLT_MAX), m_active(false)
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 2363f1e2d4..8eff53e6dc 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -84,7 +84,7 @@ public:
     void resetTarget() {
         if (!m_target)
             return;
-        m_target = 0;
+        m_target = nullptr;
         Q_EMIT targetChanged();
     }
 
@@ -270,7 +270,7 @@ class Q_AUTOTEST_EXPORT QQuickPinchArea : public QQuickItem
     Q_PROPERTY(QQuickPinch *pinch READ pinch CONSTANT)
 
 public:
-    QQuickPinchArea(QQuickItem *parent=0);
+    QQuickPinchArea(QQuickItem *parent=nullptr);
     ~QQuickPinchArea();
 
     bool isEnabled() const;
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index e752e2538f..493db51666 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -69,7 +69,7 @@ void QQuickBasePositionerPrivate::unwatchChanges(QQuickItem* other)
 
 QQuickBasePositioner::PositionedItem::PositionedItem(QQuickItem *i)
     : item(i)
-    , transitionableItem(0)
+    , transitionableItem(nullptr)
     , index(-1)
     , isNew(false)
     , isVisible(true)
@@ -203,7 +203,7 @@ void QQuickBasePositioner::setSpacing(qreal s)
 QQuickTransition *QQuickBasePositioner::populate() const
 {
     Q_D(const QQuickBasePositioner);
-    return d->transitioner ? d->transitioner->populateTransition : 0;
+    return d->transitioner ? d->transitioner->populateTransition : nullptr;
 }
 
 void QQuickBasePositioner::setPopulate(QQuickTransition *transition)
@@ -220,7 +220,7 @@ void QQuickBasePositioner::setPopulate(QQuickTransition *transition)
 QQuickTransition *QQuickBasePositioner::move() const
 {
     Q_D(const QQuickBasePositioner);
-    return d->transitioner ? d->transitioner->displacedTransition : 0;
+    return d->transitioner ? d->transitioner->displacedTransition : nullptr;
 }
 
 void QQuickBasePositioner::setMove(QQuickTransition *mt)
@@ -238,7 +238,7 @@ void QQuickBasePositioner::setMove(QQuickTransition *mt)
 QQuickTransition *QQuickBasePositioner::add() const
 {
     Q_D(const QQuickBasePositioner);
-    return d->transitioner ? d->transitioner->addTransition : 0;
+    return d->transitioner ? d->transitioner->addTransition : nullptr;
 }
 
 void QQuickBasePositioner::setAdd(QQuickTransition *add)
@@ -460,15 +460,15 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp
     // be changed to run only when there are attached properties present. This
     // could be a flag in the positioner that is set by the attached property
     // constructor.
-    QQuickPositionerAttached *prevLastProperty = 0;
-    QQuickPositionerAttached *lastProperty = 0;
+    QQuickPositionerAttached *prevLastProperty = nullptr;
+    QQuickPositionerAttached *lastProperty = nullptr;
 
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (!child.item)
             continue;
 
-        QQuickPositionerAttached *property = 0;
+        QQuickPositionerAttached *property = nullptr;
 
         if (specificProperty) {
             if (specificPropertyOwner == child.item) {
@@ -503,7 +503,7 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp
         if (!child.item)
             continue;
 
-        QQuickPositionerAttached *property = 0;
+        QQuickPositionerAttached *property = nullptr;
 
         if (specificProperty) {
             if (specificPropertyOwner == child.item) {
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index ce583aefe8..94a737e1f1 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -132,7 +132,7 @@ public:
 
     static QQuickPositionerAttached *qmlAttachedProperties(QObject *obj);
 
-    void updateAttachedProperties(QQuickPositionerAttached *specificProperty = 0, QQuickItem *specificPropertyOwner = 0) const;
+    void updateAttachedProperties(QQuickPositionerAttached *specificProperty = nullptr, QQuickItem *specificPropertyOwner = nullptr) const;
 
     qreal padding() const;
     void setPadding(qreal padding);
@@ -231,7 +231,7 @@ class Q_AUTOTEST_EXPORT QQuickColumn : public QQuickBasePositioner
 {
     Q_OBJECT
 public:
-    QQuickColumn(QQuickItem *parent=0);
+    QQuickColumn(QQuickItem *parent=nullptr);
 
 protected:
     void doPositioning(QSizeF *contentSize) override;
@@ -247,7 +247,7 @@ class Q_AUTOTEST_EXPORT QQuickRow: public QQuickBasePositioner
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 public:
-    QQuickRow(QQuickItem *parent=0);
+    QQuickRow(QQuickItem *parent=nullptr);
 
     Qt::LayoutDirection layoutDirection() const;
     void setLayoutDirection (Qt::LayoutDirection);
@@ -281,7 +281,7 @@ class Q_AUTOTEST_EXPORT QQuickGrid : public QQuickBasePositioner
     Q_PROPERTY(VAlignment verticalItemAlignment READ vItemAlign WRITE setVItemAlign NOTIFY verticalAlignmentChanged REVISION 1)
 
 public:
-    QQuickGrid(QQuickItem *parent=0);
+    QQuickGrid(QQuickItem *parent=nullptr);
 
     int rows() const { return m_rows; }
     void setRows(const int rows);
@@ -360,7 +360,7 @@ class Q_AUTOTEST_EXPORT QQuickFlow: public QQuickBasePositioner
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 public:
-    QQuickFlow(QQuickItem *parent=0);
+    QQuickFlow(QQuickItem *parent=nullptr);
 
     enum Flow { LeftToRight, TopToBottom };
     Q_ENUM(Flow)
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index 9308553a79..3895f59ae1 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -414,7 +414,7 @@ void QQuickRectangle::setGradient(QQuickGradient *gradient)
 
 void QQuickRectangle::resetGradient()
 {
-    setGradient(0);
+    setGradient(nullptr);
 }
 
 /*!
@@ -489,7 +489,7 @@ QSGNode *QQuickRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     if (width() <= 0 || height() <= 0
             || (d->color.alpha() == 0 && (!d->pen || d->pen->width() == 0 || d->pen->color().alpha() == 0))) {
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
     QSGInternalRectangleNode *rectangle = static_cast<QSGInternalRectangleNode *>(oldNode);
diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h
index 52f0bc975b..636f8c5db6 100644
--- a/src/quick/items/qquickrectangle_p.h
+++ b/src/quick/items/qquickrectangle_p.h
@@ -67,7 +67,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPen : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged)
     Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY penChanged)
 public:
-    QQuickPen(QObject *parent=0);
+    QQuickPen(QObject *parent=nullptr);
 
     qreal width() const;
     void setWidth(qreal w);
@@ -98,7 +98,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickGradientStop : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor)
 
 public:
-    QQuickGradientStop(QObject *parent=0);
+    QQuickGradientStop(QObject *parent=nullptr);
 
     qreal position() const;
     void setPosition(qreal position);
@@ -122,7 +122,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickGradient : public QObject
     Q_CLASSINFO("DefaultProperty", "stops")
 
 public:
-    QQuickGradient(QObject *parent=0);
+    QQuickGradient(QObject *parent=nullptr);
     ~QQuickGradient();
 
     QQmlListProperty<QQuickGradientStop> stops();
@@ -151,7 +151,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickRectangle : public QQuickItem
     Q_PROPERTY(QQuickPen * border READ border CONSTANT)
     Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
 public:
-    QQuickRectangle(QQuickItem *parent=0);
+    QQuickRectangle(QQuickItem *parent=nullptr);
 
     QColor color() const;
     void setColor(const QColor &);
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index 58b76fa862..49568db552 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -133,11 +133,11 @@ extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_
   \inmodule QtQuick
 */
 
-QSGContext *QQuickRenderControlPrivate::sg = 0;
+QSGContext *QQuickRenderControlPrivate::sg = nullptr;
 
 QQuickRenderControlPrivate::QQuickRenderControlPrivate()
     : initialized(0),
-      window(0)
+      window(nullptr)
 {
     if (!sg) {
         qAddPostRoutine(cleanup);
@@ -149,7 +149,7 @@ QQuickRenderControlPrivate::QQuickRenderControlPrivate()
 void QQuickRenderControlPrivate::cleanup()
 {
     delete sg;
-    sg = 0;
+    sg = nullptr;
 }
 
 /*!
@@ -173,7 +173,7 @@ QQuickRenderControl::~QQuickRenderControl()
     invalidate();
 
     if (d->window)
-        QQuickWindowPrivate::get(d->window)->renderControl = 0;
+        QQuickWindowPrivate::get(d->window)->renderControl = nullptr;
 
     // It is likely that the cleanup in windowDestroyed() is not called since
     // the standard pattern is to destroy the rendercontrol before the QQuickWindow.
@@ -187,16 +187,16 @@ void QQuickRenderControlPrivate::windowDestroyed()
 {
     if (window) {
         rc->invalidate();
-        QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+        QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
 
         delete QQuickWindowPrivate::get(window)->animationController;
-        QQuickWindowPrivate::get(window)->animationController = 0;
+        QQuickWindowPrivate::get(window)->animationController = nullptr;
 
 #if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
         QQuickOpenGLShaderEffectMaterial::cleanupMaterialCache();
 #endif
 
-        window = 0;
+        window = nullptr;
     }
 }
 
@@ -452,11 +452,11 @@ void QQuickRenderControlPrivate::maybeUpdate()
 QWindow *QQuickRenderControl::renderWindowFor(QQuickWindow *win, QPoint *offset)
 {
     if (!win)
-        return 0;
+        return nullptr;
     QQuickRenderControl *rc = QQuickWindowPrivate::get(win)->renderControl;
     if (rc)
         return rc->renderWindow(offset);
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index ba9460bf76..b95fa3c410 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -50,7 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 QQuickRepeaterPrivate::QQuickRepeaterPrivate()
-    : model(0)
+    : model(nullptr)
     , ownModel(false)
     , dataSourceIsObject(false)
     , delegateValidated(false)
@@ -216,8 +216,8 @@ void QQuickRepeater::setModel(const QVariant &m)
     d->dataSource = model;
     QObject *object = qvariant_cast<QObject*>(model);
     d->dataSourceAsObject = object;
-    d->dataSourceIsObject = object != 0;
-    QQmlInstanceModel *vim = 0;
+    d->dataSourceIsObject = object != nullptr;
+    QQmlInstanceModel *vim = nullptr;
     if (object && (vim = qobject_cast<QQmlInstanceModel *>(object))) {
         if (d->ownModel) {
             delete d->model;
@@ -288,7 +288,7 @@ QQmlComponent *QQuickRepeater::delegate() const
             return dataModel->delegate();
     }
 
-    return 0;
+    return nullptr;
 }
 
 void QQuickRepeater::setDelegate(QQmlComponent *delegate)
@@ -339,7 +339,7 @@ QQuickItem *QQuickRepeater::itemAt(int index) const
     Q_D(const QQuickRepeater);
     if (index >= 0 && index < d->deletables.count())
         return d->deletables[index];
-    return 0;
+    return nullptr;
 }
 
 void QQuickRepeater::componentComplete()
@@ -378,7 +378,7 @@ void QQuickRepeater::clear()
         }
         for (QQuickItem *item : qAsConst(d->deletables)) {
             if (item)
-                item->setParentItem(0);
+                item->setParentItem(nullptr);
         }
     }
     d->deletables.clear();
@@ -482,7 +482,7 @@ void QQuickRepeater::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
             emit itemRemoved(index, item);
             if (item) {
                 d->model->release(item);
-                item->setParentItem(0);
+                item->setParentItem(nullptr);
             }
             --d->itemCount;
         }
@@ -510,7 +510,7 @@ void QQuickRepeater::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
         } else for (int i = 0; i < insert.count; ++i) {
             int modelIndex = index + i;
             ++d->itemCount;
-            d->deletables.insert(modelIndex, 0);
+            d->deletables.insert(modelIndex, nullptr);
             QObject *object = d->model->object(modelIndex, QQmlIncubator::AsynchronousIfNested);
             if (object)
                 d->model->release(object);
diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h
index 39e29937f9..dbe3cd0c55 100644
--- a/src/quick/items/qquickrepeater_p.h
+++ b/src/quick/items/qquickrepeater_p.h
@@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT QQuickRepeater : public QQuickItem
     Q_CLASSINFO("DefaultProperty", "delegate")
 
 public:
-    QQuickRepeater(QQuickItem *parent=0);
+    QQuickRepeater(QQuickItem *parent=nullptr);
     virtual ~QQuickRepeater();
 
     QVariant model() const;
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 7f6a31a7bd..5752f61e3f 100644
--- a/src/quick/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -71,7 +71,7 @@ class Q_AUTOTEST_EXPORT QQuickScaleGrid : public QObject
     Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY borderChanged)
 
 public:
-    QQuickScaleGrid(QObject *parent=0);
+    QQuickScaleGrid(QObject *parent=nullptr);
     ~QQuickScaleGrid();
 
     bool isNull() const;
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 6a3eab957e..aea7e44a65 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -423,8 +423,8 @@ QScreen *QQuickScreenInfo::wrappedScreen() const
 
 QQuickScreenAttached::QQuickScreenAttached(QObject* attachee)
     : QQuickScreenInfo(attachee)
-    , m_window(NULL)
-    , m_updateMask(0)
+    , m_window(nullptr)
+    , m_updateMask(nullptr)
     , m_updateMaskSet(false)
 {
     m_attachee = qobject_cast<QQuickItem*>(attachee);
@@ -475,7 +475,7 @@ void QQuickScreenAttached::windowChanged(QQuickWindow* c)
     if (m_window)
         disconnect(m_window, SIGNAL(screenChanged(QScreen*)), this, SLOT(screenChanged(QScreen*)));
     m_window = c;
-    screenChanged(c ? c->screen() : NULL);
+    screenChanged(c ? c->screen() : nullptr);
     if (c)
         connect(c, SIGNAL(screenChanged(QScreen*)), this, SLOT(screenChanged(QScreen*)));
 }
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 30bd018098..cabad930fc 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -91,7 +91,7 @@ public:
     };
     Q_ENUM(Status)
 
-    QQuickShaderEffect(QQuickItem *parent = 0);
+    QQuickShaderEffect(QQuickItem *parent = nullptr);
 
     QByteArray fragmentShader() const;
     void setFragmentShader(const QByteArray &code);
diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h
index f3ac956f60..5d6641429a 100644
--- a/src/quick/items/qquickshadereffectmesh_p.h
+++ b/src/quick/items/qquickshadereffectmesh_p.h
@@ -76,7 +76,7 @@ class QQuickShaderEffectMesh : public QObject
 {
     Q_OBJECT
 public:
-    QQuickShaderEffectMesh(QObject *parent = 0);
+    QQuickShaderEffectMesh(QObject *parent = nullptr);
     virtual bool validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) = 0;
     // If 'geometry' != 0, 'attrCount' is the same as last time the function was called.
     virtual QSGGeometry *updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex,
@@ -94,7 +94,7 @@ class QQuickGridMesh : public QQuickShaderEffectMesh
     Q_OBJECT
     Q_PROPERTY(QSize resolution READ resolution WRITE setResolution NOTIFY resolutionChanged)
 public:
-    QQuickGridMesh(QObject *parent = 0);
+    QQuickGridMesh(QObject *parent = nullptr);
     bool validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) override;
     QSGGeometry *updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex,
                                 const QRectF &srcRect, const QRectF &rect) override;
@@ -121,7 +121,7 @@ class QQuickBorderImageMesh : public QQuickShaderEffectMesh
     Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
     Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
 public:
-    QQuickBorderImageMesh(QObject *parent = 0);
+    QQuickBorderImageMesh(QObject *parent = nullptr);
 
     bool validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) override;
     QSGGeometry *updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex,
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index b4a45431c5..4782672858 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -56,7 +56,7 @@ class QQuickShaderEffectSourceTextureProvider : public QSGTextureProvider
     Q_OBJECT
 public:
     QQuickShaderEffectSourceTextureProvider()
-        : sourceTexture(0)
+        : sourceTexture(nullptr)
         , mipmapFiltering(QSGTexture::None)
         , filtering(QSGTexture::Nearest)
         , horizontalWrap(QSGTexture::ClampToEdge)
@@ -183,10 +183,10 @@ public:
 
 QQuickShaderEffectSource::QQuickShaderEffectSource(QQuickItem *parent)
     : QQuickItem(parent)
-    , m_provider(0)
-    , m_texture(0)
+    , m_provider(nullptr)
+    , m_texture(nullptr)
     , m_wrapMode(ClampToEdge)
-    , m_sourceItem(0)
+    , m_sourceItem(nullptr)
     , m_textureSize(0, 0)
     , m_format(RGBA)
     , m_samples(0)
@@ -246,7 +246,7 @@ QSGTextureProvider *QQuickShaderEffectSource::textureProvider() const
     const QQuickItemPrivate *d = QQuickItemPrivate::get(this);
     if (!d->window || !d->sceneGraphRenderContext() || QThread::currentThread() != d->sceneGraphRenderContext()->thread()) {
         qWarning("QQuickShaderEffectSource::textureProvider: can only be queried on the rendering thread of an exposed window");
-        return 0;
+        return nullptr;
     }
 
     if (!m_provider) {
@@ -334,8 +334,8 @@ void QQuickShaderEffectSource::setSourceItem(QQuickItem *item)
 
     if (m_sourceItem) {
         if (window() == m_sourceItem->window()
-                || (window() == 0 && m_sourceItem->window())
-                || (m_sourceItem->window() == 0 && window())) {
+                || (window() == nullptr && m_sourceItem->window())
+                || (m_sourceItem->window() == nullptr && window())) {
             QQuickItemPrivate *d = QQuickItemPrivate::get(item);
             // 'item' needs a window to get a scene graph node. It usually gets one through its
             // parent, but if the source item is "inline" rather than a reference -- i.e.
@@ -350,7 +350,7 @@ void QQuickShaderEffectSource::setSourceItem(QQuickItem *item)
             connect(m_sourceItem, SIGNAL(destroyed(QObject*)), this, SLOT(sourceItemDestroyed(QObject*)));
         } else {
             qWarning("ShaderEffectSource: sourceItem and ShaderEffectSource must both be children of the same window.");
-            m_sourceItem = 0;
+            m_sourceItem = nullptr;
         }
     }
     update();
@@ -361,7 +361,7 @@ void QQuickShaderEffectSource::sourceItemDestroyed(QObject *item)
 {
     Q_ASSERT(item == m_sourceItem);
     Q_UNUSED(item);
-    m_sourceItem = 0;
+    m_sourceItem = nullptr;
     update();
     emit sourceItemChanged();
 }
@@ -662,8 +662,8 @@ void QQuickShaderEffectSource::releaseResources()
     if (m_texture || m_provider) {
         window()->scheduleRenderJob(new QQuickShaderEffectSourceCleanup(m_texture, m_provider),
                                     QQuickWindow::AfterSynchronizingStage);
-        m_texture = 0;
-        m_provider = 0;
+        m_texture = nullptr;
+        m_provider = nullptr;
     }
 }
 
@@ -684,9 +684,9 @@ QSGNode *QQuickShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaint
 {
     if (!m_sourceItem || m_sourceItem->width() <= 0 || m_sourceItem->height() <= 0) {
         if (m_texture)
-            m_texture->setItem(0);
+            m_texture->setItem(nullptr);
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
     ensureTexture();
@@ -745,7 +745,7 @@ QSGNode *QQuickShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaint
     // Don't create the paint node if we're not spanning any area
     if (width() <= 0 || height() <= 0) {
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
     QSGInternalImageNode *node = static_cast<QSGInternalImageNode *>(oldNode);
@@ -779,8 +779,8 @@ void QQuickShaderEffectSource::invalidateSceneGraph()
         delete m_texture;
     if (m_provider)
         delete m_provider;
-    m_texture = 0;
-    m_provider = 0;
+    m_texture = nullptr;
+    m_provider = nullptr;
 }
 
 void QQuickShaderEffectSource::itemChange(ItemChange change, const ItemChangeData &value)
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index 185c5179b6..f70550f284 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -113,7 +113,7 @@ public:
     };
     Q_ENUM(TextureMirroring)
 
-    QQuickShaderEffectSource(QQuickItem *parent = 0);
+    QQuickShaderEffectSource(QQuickItem *parent = nullptr);
     ~QQuickShaderEffectSource();
 
     WrapMode wrapMode() const;
diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h
index 2f7f6da5c0..19cbc416ca 100644
--- a/src/quick/items/qquicksprite_p.h
+++ b/src/quick/items/qquicksprite_p.h
@@ -88,7 +88,7 @@ class Q_QUICK_EXPORT QQuickSprite : public QQuickStochasticState
     Q_PROPERTY(int frameDurationVariation READ frameDurationVariation WRITE setFrameDurationVariation NOTIFY frameDurationVariationChanged)
 
 public:
-    explicit QQuickSprite(QObject *parent = 0);
+    explicit QQuickSprite(QObject *parent = nullptr);
     ~QQuickSprite();
 
     QUrl source() const
diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index ff02135799..416e6611b5 100644
--- a/src/quick/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -81,7 +81,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStochasticState : public QObject //Currently
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 
 public:
-    QQuickStochasticState(QObject* parent = 0)
+    QQuickStochasticState(QObject* parent = nullptr)
         : QObject(parent)
         , m_duration(-1)
         , m_durationVariation(0)
@@ -193,8 +193,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStochasticEngine : public QObject
     Q_PROPERTY(QString globalGoal READ globalGoal WRITE setGlobalGoal NOTIFY globalGoalChanged)
     Q_PROPERTY(QQmlListProperty<QQuickStochasticState> states READ states)
 public:
-    explicit QQuickStochasticEngine(QObject *parent = 0);
-    QQuickStochasticEngine(const QList<QQuickStochasticState*> &states, QObject *parent = 0);
+    explicit QQuickStochasticEngine(QObject *parent = nullptr);
+    QQuickStochasticEngine(const QList<QQuickStochasticState*> &states, QObject *parent = nullptr);
     ~QQuickStochasticEngine();
 
     QQmlListProperty<QQuickStochasticState> states()
@@ -270,8 +270,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickSpriteEngine : public QQuickStochasticEngine
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites)
 public:
-    explicit QQuickSpriteEngine(QObject *parent = 0);
-    QQuickSpriteEngine(const QList<QQuickSprite*> &sprites, QObject *parent = 0);
+    explicit QQuickSpriteEngine(QObject *parent = nullptr);
+    QQuickSpriteEngine(const QList<QQuickSprite*> &sprites, QObject *parent = nullptr);
     ~QQuickSpriteEngine();
     QQmlListProperty<QQuickSprite> sprites()
     {
@@ -303,7 +303,7 @@ public:
     QImage assembledImage(int maxSize = 2048);
 
 private:
-    int pseudospriteProgress(int, int, int *rd = 0) const;
+    int pseudospriteProgress(int, int, int *rd = nullptr) const;
     QList<QQuickSprite*> m_sprites;
     bool m_startedImageAssembly;
     bool m_loaded;
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index ae466aa482..0a39c09ebc 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -199,7 +199,7 @@ void QQuickSpriteSequence::createEngine()
         if (!d->m_goalState.isEmpty())
             d->m_spriteEngine->setGoal(d->m_spriteEngine->stateIndex(d->m_goalState));
     } else {
-        d->m_spriteEngine = 0;
+        d->m_spriteEngine = nullptr;
     }
     reset();
 }
diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h
index ffcefecaec..899ce79e0e 100644
--- a/src/quick/items/qquickspritesequence_p.h
+++ b/src/quick/items/qquickspritesequence_p.h
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QQuickSpriteSequence : public QQuickItem
     Q_CLASSINFO("DefaultProperty", "sprites")
 
 public:
-    explicit QQuickSpriteSequence(QQuickItem *parent = 0);
+    explicit QQuickSpriteSequence(QQuickItem *parent = nullptr);
 
     QQmlListProperty<QQuickSprite> sprites();
 
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 386bb058b5..a85b9663d3 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -51,8 +51,8 @@ class QQuickParentChangePrivate : public QQuickStateOperationPrivate
 {
     Q_DECLARE_PUBLIC(QQuickParentChange)
 public:
-    QQuickParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0),
-        rewindParent(0), rewindStackBefore(0) {}
+    QQuickParentChangePrivate() : target(nullptr), parent(nullptr), origParent(nullptr), origStackBefore(nullptr),
+        rewindParent(nullptr), rewindStackBefore(nullptr) {}
 
     QQuickItem *target;
     QPointer<QQuickItem> parent;
@@ -68,7 +68,7 @@ public:
     QQmlNullableValue<QQmlScriptString> scaleString;
     QQmlNullableValue<QQmlScriptString> rotationString;
 
-    void doChange(QQuickItem *targetParent, QQuickItem *stackBefore = 0);
+    void doChange(QQuickItem *targetParent, QQuickItem *stackBefore = nullptr);
 };
 
 void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *stackBefore)
@@ -524,13 +524,13 @@ void QQuickParentChange::saveCurrentValues()
 {
     Q_D(QQuickParentChange);
     if (!d->target) {
-        d->rewindParent = 0;
-        d->rewindStackBefore = 0;
+        d->rewindParent = nullptr;
+        d->rewindStackBefore = nullptr;
         return;
     }
 
     d->rewindParent = d->target->parentItem();
-    d->rewindStackBefore = 0;
+    d->rewindStackBefore = nullptr;
 
     if (!d->rewindParent)
         return;
@@ -588,7 +588,7 @@ class QQuickAnchorSetPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickAnchorSet)
 public:
     QQuickAnchorSetPrivate()
-      : usedAnchors(0), resetAnchors(0)
+      : usedAnchors(nullptr), resetAnchors(nullptr)
     {
     }
 
@@ -771,7 +771,7 @@ class QQuickAnchorChangesPrivate : public QQuickStateOperationPrivate
 {
 public:
     QQuickAnchorChangesPrivate()
-        : target(0), anchorSet(new QQuickAnchorSet)
+        : target(nullptr), anchorSet(new QQuickAnchorSet)
     {
 
     }
@@ -855,7 +855,7 @@ QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions()
     Q_D(QQuickAnchorChanges);
     //### ASSERT these are all 0?
     d->leftBinding = d->rightBinding = d->hCenterBinding = d->topBinding
-                   = d->bottomBinding = d->vCenterBinding = d->baselineBinding = 0;
+                   = d->bottomBinding = d->vCenterBinding = d->baselineBinding = nullptr;
 
     d->leftProp = QQmlProperty(d->target, QLatin1String("anchors.left"));
     d->rightProp = QQmlProperty(d->target, QLatin1String("anchors.right"));
@@ -1236,20 +1236,20 @@ void QQuickAnchorChanges::copyOriginals(QQuickStateActionEvent *other)
 
     //clear old values from other
     //### could this be generalized for all QQuickStateActionEvents, and called after copyOriginals?
-    acp->leftBinding = 0;
-    acp->rightBinding = 0;
-    acp->hCenterBinding = 0;
-    acp->topBinding = 0;
-    acp->bottomBinding = 0;
-    acp->vCenterBinding = 0;
-    acp->baselineBinding = 0;
-    acp->origLeftBinding = 0;
-    acp->origRightBinding = 0;
-    acp->origHCenterBinding = 0;
-    acp->origTopBinding = 0;
-    acp->origBottomBinding = 0;
-    acp->origVCenterBinding = 0;
-    acp->origBaselineBinding = 0;
+    acp->leftBinding = nullptr;
+    acp->rightBinding = nullptr;
+    acp->hCenterBinding = nullptr;
+    acp->topBinding = nullptr;
+    acp->bottomBinding = nullptr;
+    acp->vCenterBinding = nullptr;
+    acp->baselineBinding = nullptr;
+    acp->origLeftBinding = nullptr;
+    acp->origRightBinding = nullptr;
+    acp->origHCenterBinding = nullptr;
+    acp->origTopBinding = nullptr;
+    acp->origBottomBinding = nullptr;
+    acp->origVCenterBinding = nullptr;
+    acp->origBaselineBinding = nullptr;
 
     saveCurrentValues();
 }
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index d61ed294cb..e947b2213f 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -75,7 +75,7 @@ class Q_AUTOTEST_EXPORT QQuickParentChange : public QQuickStateOperation, public
     Q_PROPERTY(QQmlScriptString scale READ scale WRITE setScale)
     Q_PROPERTY(QQmlScriptString rotation READ rotation WRITE setRotation)
 public:
-    QQuickParentChange(QObject *parent=0);
+    QQuickParentChange(QObject *parent=nullptr);
     ~QQuickParentChange();
 
     QQuickItem *object() const;
@@ -138,7 +138,7 @@ class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject
     Q_PROPERTY(QQmlScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline)
 
 public:
-    QQuickAnchorSet(QObject *parent=0);
+    QQuickAnchorSet(QObject *parent=nullptr);
     virtual ~QQuickAnchorSet();
 
     QQmlScriptString left() const;
@@ -187,7 +187,7 @@ class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QQuickStateOperation, publi
     Q_PROPERTY(QQuickAnchorSet *anchors READ anchors CONSTANT)
 
 public:
-    QQuickAnchorChanges(QObject *parent=0);
+    QQuickAnchorChanges(QObject *parent=nullptr);
     ~QQuickAnchorChanges();
 
     ActionList actions() override;
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index d601087296..383aa2b821 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -74,7 +74,7 @@ Q_DECLARE_LOGGING_CATEGORY(DBG_HOVER_TRACE)
 const QChar QQuickTextPrivate::elideChar = QChar(0x2026);
 
 QQuickTextPrivate::QQuickTextPrivate()
-    : fontInfo(font), elideLayout(0), textLine(0), lineWidth(0)
+    : fontInfo(font), elideLayout(nullptr), textLine(nullptr), lineWidth(0)
     , color(0xFF000000), linkColor(0xFF0000FF), styleColor(0xFF000000)
     , lineCount(1), multilengthEos(-1)
     , elideMode(QQuickText::ElideNone), hAlign(QQuickText::AlignLeft), vAlign(QQuickText::AlignTop)
@@ -103,7 +103,7 @@ QQuickTextPrivate::ExtraData::ExtraData()
     , explicitRightPadding(false)
     , explicitBottomPadding(false)
     , lineHeight(1.0)
-    , doc(0)
+    , doc(nullptr)
     , minimumPixelSize(12)
     , minimumPointSize(12)
     , nbActiveDownloads(0)
@@ -124,7 +124,7 @@ void QQuickTextPrivate::init()
 QQuickTextPrivate::~QQuickTextPrivate()
 {
     delete elideLayout;
-    delete textLine; textLine = 0;
+    delete textLine; textLine = nullptr;
 
     if (extra.isAllocated()) {
         qDeleteAll(extra->imgTags);
@@ -478,7 +478,7 @@ void QQuickTextPrivate::updateSize()
 }
 
 QQuickTextLine::QQuickTextLine()
-    : QObject(), m_line(0), m_height(0), m_lineOffset(0)
+    : QObject(), m_line(nullptr), m_height(0), m_lineOffset(0)
 {
 }
 
@@ -1110,7 +1110,7 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
             layout.clearLayout();
     } else {
         delete elideLayout;
-        elideLayout = 0;
+        elideLayout = nullptr;
     }
 
     QTextLine firstLine = visibleCount == 1 && elideLayout
@@ -2363,10 +2363,10 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
 
     if (d->text.isEmpty()) {
         delete oldNode;
-        return 0;
+        return nullptr;
     }
 
-    if (d->updateType != QQuickTextPrivate::UpdatePaintNode && oldNode != 0) {
+    if (d->updateType != QQuickTextPrivate::UpdatePaintNode && oldNode != nullptr) {
         // Update done in preprocess() in the nodes
         d->updateType = QQuickTextPrivate::UpdateNone;
         return oldNode;
@@ -2376,7 +2376,7 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
 
     const qreal dy = QQuickTextUtil::alignedY(d->layedOutTextRect.height() + d->lineHeightOffset(), d->availableHeight(), d->vAlign) + topPadding();
 
-    QQuickTextNode *node = 0;
+    QQuickTextNode *node = nullptr;
     if (!oldNode)
         node = new QQuickTextNode(this);
     else
@@ -2918,14 +2918,14 @@ void QQuickText::invalidateFontCaches()
 {
     Q_D(QQuickText);
 
-    if (d->richText && d->extra.isAllocated() && d->extra->doc != 0) {
+    if (d->richText && d->extra.isAllocated() && d->extra->doc != nullptr) {
         QTextBlock block;
         for (block = d->extra->doc->firstBlock(); block.isValid(); block = block.next()) {
-            if (block.layout() != 0 && block.layout()->engine() != 0)
+            if (block.layout() != nullptr && block.layout()->engine() != nullptr)
                 block.layout()->engine()->resetFontEngineCache();
         }
     } else {
-        if (d->layout.engine() != 0)
+        if (d->layout.engine() != nullptr)
             d->layout.engine()->resetFontEngineCache();
     }
 }
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 6c48dd86a9..039ede2bad 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -102,7 +102,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem
     Q_PROPERTY(QSizeF advance READ advance NOTIFY contentSizeChanged REVISION 10)
 
 public:
-    QQuickText(QQuickItem *parent=0);
+    QQuickText(QQuickItem *parent=nullptr);
     ~QQuickText();
 
     enum HAlignment { AlignLeft = Qt::AlignLeft,
@@ -289,7 +289,7 @@ Q_SIGNALS:
     Q_REVISION(9) void fontInfoChanged();
 
 protected:
-    QQuickText(QQuickTextPrivate &dd, QQuickItem *parent = 0);
+    QQuickText(QQuickTextPrivate &dd, QQuickItem *parent = nullptr);
 
     void mousePressEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index 6fd0876a5f..b0b1492d57 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -83,7 +83,7 @@ public:
     void setLineGeometry(QTextLine &line, qreal lineWidth, qreal &height);
 
     int lineHeightOffset() const;
-    QString elidedText(qreal lineWidth, const QTextLine &line, QTextLine *nextLine = 0) const;
+    QString elidedText(qreal lineWidth, const QTextLine &line, QTextLine *nextLine = nullptr) const;
     void elideFormats(int start, int length, int offset, QVector<QTextLayout::FormatRange> *elidedFormats);
     void clearFormats();
 
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 874c02fc99..e3080dfe48 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -95,7 +95,7 @@ static QTextLine currentTextLine(const QTextCursor &cursor)
 }
 
 QQuickTextControlPrivate::QQuickTextControlPrivate()
-    : doc(0),
+    : doc(nullptr),
 #if QT_CONFIG(im)
       preeditCursor(0),
 #endif
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h
index 862a81af28..c99736a874 100644
--- a/src/quick/items/qquicktextcontrol_p.h
+++ b/src/quick/items/qquicktextcontrol_p.h
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QQuickTextControl : public QInputControl
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickTextControl)
 public:
-    explicit QQuickTextControl(QTextDocument *doc, QObject *parent = 0);
+    explicit QQuickTextControl(QTextDocument *doc, QObject *parent = nullptr);
     virtual ~QQuickTextControl();
 
     QTextDocument *document() const;
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 10abc1176a..352fc48970 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -139,7 +139,7 @@ namespace {
     class RootNode : public QSGTransformNode
     {
     public:
-        RootNode() : cursorNode(0), frameDecorationsNode(0)
+        RootNode() : cursorNode(nullptr), frameDecorationsNode(nullptr)
         { }
 
         void resetFrameDecorations(QQuickTextNode* newNode)
@@ -1991,12 +1991,12 @@ static inline void updateNodeTransform(QQuickTextNode* node, const QPointF &topL
 void QQuickTextEdit::invalidateFontCaches()
 {
     Q_D(QQuickTextEdit);
-    if (d->document == 0)
+    if (d->document == nullptr)
         return;
 
     QTextBlock block;
     for (block = d->document->firstBlock(); block.isValid(); block = block.next()) {
-        if (block.layout() != 0 && block.layout()->engine() != 0)
+        if (block.layout() != nullptr && block.layout()->engine() != nullptr)
             block.layout()->engine()->resetFontEngineCache();
     }
 }
@@ -2014,7 +2014,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
     Q_UNUSED(updatePaintNodeData);
     Q_D(QQuickTextEdit);
 
-    if (d->updateType != QQuickTextEditPrivate::UpdatePaintNode && oldNode != 0) {
+    if (d->updateType != QQuickTextEditPrivate::UpdatePaintNode && oldNode != nullptr) {
         // Update done in preprocess() in the nodes
         d->updateType = QQuickTextEditPrivate::UpdateNone;
         return oldNode;
@@ -2055,7 +2055,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
         rootNode->resetFrameDecorations(d->createTextNode());
         resetEngine(&frameDecorationsEngine, d->color, d->selectedTextColor, d->selectionColor);
 
-        QQuickTextNode *node = 0;
+        QQuickTextNode *node = nullptr;
 
         int currentNodeSize = 0;
         int nodeStart = firstDirtyPos;
@@ -2159,8 +2159,8 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
         std::sort(d->textNodeMap.begin(), d->textNodeMap.end());
     }
 
-    if (d->cursorComponent == 0) {
-        QSGInternalRectangleNode* cursor = 0;
+    if (d->cursorComponent == nullptr) {
+        QSGInternalRectangleNode* cursor = nullptr;
         if (!isReadOnly() && d->cursorVisible && d->control->cursorOn())
             cursor = d->sceneGraphContext()->createInternalRectangleNode(d->control->cursorRect(), d->color);
         rootNode->resetCursorNode(cursor);
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index c883e39168..7a847ffeae 100644
--- a/src/quick/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -114,7 +114,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
     Q_PROPERTY(qreal tabStopDistance READ tabStopDistance WRITE setTabStopDistance NOTIFY tabStopDistanceChanged REVISION 10)
 
 public:
-    QQuickTextEdit(QQuickItem *parent=0);
+    QQuickTextEdit(QQuickItem *parent=nullptr);
 
     enum HAlignment {
         AlignLeft = Qt::AlignLeft,
@@ -384,7 +384,7 @@ private:
     void invalidateFontCaches();
 
 protected:
-    QQuickTextEdit(QQuickTextEditPrivate &dd, QQuickItem *parent = 0);
+    QQuickTextEdit(QQuickTextEditPrivate &dd, QQuickItem *parent = nullptr);
 
     void geometryChanged(const QRectF &newGeometry,
                          const QRectF &oldGeometry) override;
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h
index ef2bdfd0ea..46d3d5ff6b 100644
--- a/src/quick/items/qquicktextedit_p_p.h
+++ b/src/quick/items/qquicktextedit_p_p.h
@@ -112,8 +112,8 @@ public:
     QQuickTextEditPrivate()
         : color(QRgb(0xFF000000)), selectionColor(QRgb(0xFF000080)), selectedTextColor(QRgb(0xFFFFFFFF))
         , textMargin(0.0), xoff(0), yoff(0)
-        , font(sourceFont), cursorComponent(0), cursorItem(0), document(0), control(0)
-        , quickDocument(0), lastSelectionStart(0), lastSelectionEnd(0), lineCount(0)
+        , font(sourceFont), cursorComponent(nullptr), cursorItem(nullptr), document(nullptr), control(nullptr)
+        , quickDocument(nullptr), lastSelectionStart(0), lastSelectionEnd(0), lineCount(0)
         , hAlign(QQuickTextEdit::AlignLeft), vAlign(QQuickTextEdit::AlignTop)
         , format(QQuickTextEdit::PlainText), wrapMode(QQuickTextEdit::NoWrap)
         , renderType(QQuickTextUtil::textRenderType<QQuickTextEdit>())
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 557ff393b4..b19c13c5ee 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1863,7 +1863,7 @@ void QQuickTextInput::invalidateFontCaches()
 {
     Q_D(QQuickTextInput);
 
-    if (d->m_textLayout.engine() != 0)
+    if (d->m_textLayout.engine() != nullptr)
         d->m_textLayout.engine()->resetFontEngineCache();
 }
 
@@ -1886,7 +1886,7 @@ QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     Q_UNUSED(data);
     Q_D(QQuickTextInput);
 
-    if (d->updateType != QQuickTextInputPrivate::UpdatePaintNode && oldNode != 0) {
+    if (d->updateType != QQuickTextInputPrivate::UpdatePaintNode && oldNode != nullptr) {
         // Update done in preprocess() in the nodes
         d->updateType = QQuickTextInputPrivate::UpdateNone;
         return oldNode;
@@ -1895,13 +1895,13 @@ QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     d->updateType = QQuickTextInputPrivate::UpdateNone;
 
     QQuickTextNode *node = static_cast<QQuickTextNode *>(oldNode);
-    if (node == 0)
+    if (node == nullptr)
         node = new QQuickTextNode(this);
     d->textNode = node;
 
-    const bool showCursor = !isReadOnly() && d->cursorItem == 0 && d->cursorVisible && d->m_blinkStatus;
+    const bool showCursor = !isReadOnly() && d->cursorItem == nullptr && d->cursorVisible && d->m_blinkStatus;
 
-    if (!d->textLayoutDirty && oldNode != 0) {
+    if (!d->textLayoutDirty && oldNode != nullptr) {
         if (showCursor)
             node->setCursor(cursorRectangle(), d->color);
         else
@@ -3828,7 +3828,7 @@ void QQuickTextInputPrivate::parseInputMask(const QString &maskFields)
     if (maskFields.isEmpty() || delimiter == 0) {
         if (m_maskData) {
             delete [] m_maskData;
-            m_maskData = 0;
+            m_maskData = nullptr;
             m_maxLength = 32767;
             internalSetText(QString());
         }
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index b7d3fb00fa..c46a2f8128 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -115,7 +115,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
     Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged REVISION 6)
 
 public:
-    QQuickTextInput(QQuickItem * parent=0);
+    QQuickTextInput(QQuickItem * parent=nullptr);
     ~QQuickTextInput();
 
     void componentComplete() override;
@@ -363,7 +363,7 @@ private:
     void ensureActiveFocus();
 
 protected:
-    QQuickTextInput(QQuickTextInputPrivate &dd, QQuickItem *parent = 0);
+    QQuickTextInput(QQuickTextInputPrivate &dd, QQuickItem *parent = nullptr);
 
     void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry) override;
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index c795aebfa9..a2e2f0f66d 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -99,9 +99,9 @@ public:
     QQuickTextInputPrivate()
         : hscroll(0)
         , vscroll(0)
-        , cursorItem(0)
-        , textNode(0)
-        , m_maskData(0)
+        , cursorItem(nullptr)
+        , textNode(nullptr)
+        , m_maskData(nullptr)
         , color(QRgb(0xFF000000))
         , selectionColor(QRgb(0xFF000080))
         , selectedTextColor(QRgb(0xFFFFFFFF))
diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index cf4e71adf5..13a8219cbd 100644
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -78,7 +78,7 @@ namespace {
   Creates an empty QQuickTextNode
 */
 QQuickTextNode::QQuickTextNode(QQuickItem *ownerElement)
-    : m_cursorNode(0), m_ownerElement(ownerElement), m_useNativeRenderer(false)
+    : m_cursorNode(nullptr), m_ownerElement(ownerElement), m_useNativeRenderer(false)
 {
 #ifdef QSG_RUNTIME_DESCRIPTION
     qsgnode_set_description(this, QLatin1String("text"));
@@ -125,7 +125,7 @@ QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun
     node->geometry()->setIndexDataPattern(QSGGeometry::StaticPattern);
     node->geometry()->setVertexDataPattern(QSGGeometry::StaticPattern);
 
-    if (parentNode == 0)
+    if (parentNode == nullptr)
         parentNode = this;
     parentNode->appendChildNode(node);
 
@@ -134,7 +134,7 @@ QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun
 
 void QQuickTextNode::setCursor(const QRectF &rect, const QColor &color)
 {
-    if (m_cursorNode != 0)
+    if (m_cursorNode != nullptr)
         delete m_cursorNode;
 
     QSGRenderContext *sg = QQuickItemPrivate::get(m_ownerElement)->sceneGraphRenderContext();
@@ -147,7 +147,7 @@ void QQuickTextNode::clearCursor()
     if (m_cursorNode)
         removeChildNode(m_cursorNode);
     delete m_cursorNode;
-    m_cursorNode = 0;
+    m_cursorNode = nullptr;
 }
 
 void QQuickTextNode::addRectangleNode(const QRectF &rect, const QColor &color)
@@ -273,9 +273,9 @@ void QQuickTextNode::addTextLayout(const QPointF &position, QTextLayout *textLay
 
 void QQuickTextNode::deleteContent()
 {
-    while (firstChild() != 0)
+    while (firstChild() != nullptr)
         delete firstChild();
-    m_cursorNode = 0;
+    m_cursorNode = nullptr;
     qDeleteAll(m_textures);
     m_textures.clear();
 }
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index c179ab7163..a53ca2a2a4 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -75,7 +75,7 @@ QQuickTextNodeEngine::BinaryTreeNode::BinaryTreeNode(const QGlyphRun &g,
     : glyphRun(g)
     , boundingRect(brect)
     , selectionState(selState)
-    , clipNode(0)
+    , clipNode(nullptr)
     , decorations(decs)
     , color(c)
     , backgroundColor(bc)
@@ -256,10 +256,10 @@ void QQuickTextNodeEngine::processCurrentLine()
     QVarLengthArray<TextDecoration> pendingOverlines;
     QVarLengthArray<TextDecoration> pendingStrikeOuts;
     if (!sortedIndexes.isEmpty()) {
-        QQuickDefaultClipNode *currentClipNode = m_hasSelection ? new QQuickDefaultClipNode(QRectF()) : 0;
+        QQuickDefaultClipNode *currentClipNode = m_hasSelection ? new QQuickDefaultClipNode(QRectF()) : nullptr;
         bool currentClipNodeUsed = false;
         for (int i=0; i<=sortedIndexes.size(); ++i) {
-            BinaryTreeNode *node = 0;
+            BinaryTreeNode *node = nullptr;
             if (i < sortedIndexes.size()) {
                 int sortedIndex = sortedIndexes.at(i);
                 Q_ASSERT(sortedIndex < m_currentLineTree.size());
@@ -275,7 +275,7 @@ void QQuickTextNodeEngine::processCurrentLine()
                 decorationRect.setY(m_position.y() + m_currentLine.y());
                 decorationRect.setHeight(m_currentLine.height());
 
-                if (node != 0)
+                if (node != nullptr)
                     decorationRect.setRight(node->boundingRect.left());
 
                 TextDecoration textDecoration(currentSelectionState, decorationRect, lastColor);
@@ -295,14 +295,14 @@ void QQuickTextNodeEngine::processCurrentLine()
             // If we've reached an unselected node from a selected node, we add the
             // selection rect to the graph, and we add decoration every time the
             // selection state changes, because that means the text color changes
-            if (node == 0 || node->selectionState != currentSelectionState) {
+            if (node == nullptr || node->selectionState != currentSelectionState) {
                 currentRect.setY(m_position.y() + m_currentLine.y());
                 currentRect.setHeight(m_currentLine.height());
 
                 if (currentSelectionState == Selected)
                     m_selectionRects.append(currentRect);
 
-                if (currentClipNode != 0) {
+                if (currentClipNode != nullptr) {
                     if (!currentClipNodeUsed) {
                         delete currentClipNode;
                     } else {
@@ -312,13 +312,13 @@ void QQuickTextNodeEngine::processCurrentLine()
                     }
                 }
 
-                if (node != 0 && m_hasSelection)
+                if (node != nullptr && m_hasSelection)
                     currentClipNode = new QQuickDefaultClipNode(QRectF());
                 else
-                    currentClipNode = 0;
+                    currentClipNode = nullptr;
                 currentClipNodeUsed = false;
 
-                if (node != 0) {
+                if (node != nullptr) {
                     currentSelectionState = node->selectionState;
                     currentRect = node->boundingRect;
 
@@ -333,7 +333,7 @@ void QQuickTextNodeEngine::processCurrentLine()
                     currentRect = currentRect.united(node->boundingRect);
             }
 
-            if (node != 0) {
+            if (node != nullptr) {
                 if (node->selectionState == Selected) {
                     node->clipNode = currentClipNode;
                     currentClipNodeUsed = true;
@@ -449,7 +449,7 @@ void QQuickTextNodeEngine::addTextObject(const QPointF &position, const QTextCha
                                          QTextFrameFormat::Position layoutPosition)
 {
     QTextObjectInterface *handler = textDocument->documentLayout()->handlerForObject(format.objectType());
-    if (handler != 0) {
+    if (handler != nullptr) {
         QImage image;
         QSizeF size = handler->intrinsicSize(textDocument, pos, format);
 
@@ -651,7 +651,7 @@ void QQuickTextNodeEngine::addFrameDecorations(QTextDocument *document, QTextFra
     QTextFrameFormat frameFormat = frame->format().toFrameFormat();
     QTextTable *table = qobject_cast<QTextTable *>(frame);
 
-    QRectF boundingRect = table == 0
+    QRectF boundingRect = table == nullptr
             ? documentLayout->frameBoundingRect(frame)
             : documentLayout->tableBoundingRect(table);
 
@@ -674,7 +674,7 @@ void QQuickTextNodeEngine::addFrameDecorations(QTextDocument *document, QTextFra
     addBorder(boundingRect.adjusted(frameFormat.leftMargin(), frameFormat.topMargin(),
                                     -frameFormat.rightMargin(), -frameFormat.bottomMargin()),
               borderWidth, borderStyle, borderBrush);
-    if (table != 0) {
+    if (table != nullptr) {
         int rows = table->rows();
         int columns = table->columns();
 
@@ -781,7 +781,7 @@ void  QQuickTextNodeEngine::addToSceneGraph(QQuickTextNode *parentNode,
     // Add all text with unselected color first
     for (int i = 0; i < nodes.size(); ++i) {
         const BinaryTreeNode *node = nodes.at(i);
-        parentNode->addGlyphs(node->position, node->glyphRun, node->color, style, styleColor, 0);
+        parentNode->addGlyphs(node->position, node->glyphRun, node->color, style, styleColor, nullptr);
     }
 
     for (int i = 0; i < imageNodes.size(); ++i) {
@@ -812,7 +812,7 @@ void  QQuickTextNodeEngine::addToSceneGraph(QQuickTextNode *parentNode,
     for (int i = 0; i < nodes.size(); ++i) {
         const BinaryTreeNode *node = nodes.at(i);
         QQuickDefaultClipNode *clipNode = node->clipNode;
-        if (clipNode != 0 && clipNode->parent() == 0)
+        if (clipNode != nullptr && clipNode->parent() == nullptr)
             parentNode->appendChildNode(clipNode);
 
         if (node->selectionState == Selected) {
@@ -820,26 +820,26 @@ void  QQuickTextNodeEngine::addToSceneGraph(QQuickTextNode *parentNode,
             int previousNodeIndex = i - 1;
             int nextNodeIndex = i + 1;
             const BinaryTreeNode *previousNode = previousNodeIndex < 0 ? 0 : nodes.at(previousNodeIndex);
-            while (previousNode != 0 && qFuzzyCompare(previousNode->boundingRect.left(), node->boundingRect.left()))
+            while (previousNode != nullptr && qFuzzyCompare(previousNode->boundingRect.left(), node->boundingRect.left()))
                 previousNode = --previousNodeIndex < 0 ? 0 : nodes.at(previousNodeIndex);
 
             const BinaryTreeNode *nextNode = nextNodeIndex == nodes.size() ? 0 : nodes.at(nextNodeIndex);
 
-            if (previousNode != 0 && previousNode->selectionState == Unselected)
+            if (previousNode != nullptr && previousNode->selectionState == Unselected)
                 parentNode->addGlyphs(previousNode->position, previousNode->glyphRun, color, style, styleColor, clipNode);
 
-            if (nextNode != 0 && nextNode->selectionState == Unselected)
+            if (nextNode != nullptr && nextNode->selectionState == Unselected)
                 parentNode->addGlyphs(nextNode->position, nextNode->glyphRun, color, style, styleColor, clipNode);
 
             // If the previous or next node completely overlaps this one, then we have already drawn the glyphs of
             // this node
             bool drawCurrent = false;
-            if (previousNode != 0 || nextNode != 0) {
+            if (previousNode != nullptr || nextNode != nullptr) {
                 for (int i = 0; i < node->ranges.size(); ++i) {
                     const QPair<int, int> &range = node->ranges.at(i);
 
                     int rangeLength = range.second - range.first + 1;
-                    if (previousNode != 0) {
+                    if (previousNode != nullptr) {
                         for (int j = 0; j < previousNode->ranges.size(); ++j) {
                             const QPair<int, int> &otherRange = previousNode->ranges.at(j);
 
@@ -853,7 +853,7 @@ void  QQuickTextNodeEngine::addToSceneGraph(QQuickTextNode *parentNode,
                         }
                     }
 
-                    if (nextNode != 0 && rangeLength > 0) {
+                    if (nextNode != nullptr && rangeLength > 0) {
                         for (int j = 0; j < nextNode->ranges.size(); ++j) {
                             const QPair<int, int> &otherRange = nextNode->ranges.at(j);
 
@@ -896,8 +896,8 @@ void  QQuickTextNodeEngine::addToSceneGraph(QQuickTextNode *parentNode,
 
 void QQuickTextNodeEngine::mergeFormats(QTextLayout *textLayout, QVarLengthArray<QTextLayout::FormatRange> *mergedFormats)
 {
-    Q_ASSERT(mergedFormats != 0);
-    if (textLayout == 0)
+    Q_ASSERT(mergedFormats != nullptr);
+    if (textLayout == nullptr)
         return;
 
     QVector<QTextLayout::FormatRange> additionalFormats = textLayout->formats();
@@ -911,7 +911,7 @@ void QQuickTextNodeEngine::mergeFormats(QTextLayout *textLayout, QVarLengthArray
                 QTextLayout::FormatRange *lastFormat = mergedFormats->data() + mergedFormats->size() - 1;
 
                 if (additionalFormat.start < lastFormat->start + lastFormat->length) {
-                    QTextLayout::FormatRange *mergedRange = 0;
+                    QTextLayout::FormatRange *mergedRange = nullptr;
 
                     int length = additionalFormat.length;
                     if (additionalFormat.start > lastFormat->start) {
diff --git a/src/quick/items/qquicktextutil.cpp b/src/quick/items/qquicktextutil.cpp
index 6aa6c5cb4b..eb356a9c48 100644
--- a/src/quick/items/qquicktextutil.cpp
+++ b/src/quick/items/qquicktextutil.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 QQuickItem *QQuickTextUtil::createCursor(
         QQmlComponent *component, QQuickItem *parent, const QRectF &rectangle, const char *className)
 {
-    QQuickItem *item = 0;
+    QQuickItem *item = nullptr;
     if (component->isReady()) {
         QQmlContext *creationContext = component->creationContext();
 
diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h
index b0199cef40..b6ea43342c 100644
--- a/src/quick/items/qquicktranslate_p.h
+++ b/src/quick/items/qquicktranslate_p.h
@@ -66,7 +66,7 @@ class Q_AUTOTEST_EXPORT QQuickTranslate : public QQuickTransform
     Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged)
 
 public:
-    QQuickTranslate(QObject *parent = 0);
+    QQuickTranslate(QObject *parent = nullptr);
     ~QQuickTranslate();
 
     qreal x() const;
@@ -96,7 +96,7 @@ class Q_AUTOTEST_EXPORT QQuickScale : public QQuickTransform
     Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged)
     Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged)
 public:
-    QQuickScale(QObject *parent = 0);
+    QQuickScale(QObject *parent = nullptr);
     ~QQuickScale();
 
     QVector3D origin() const;
@@ -133,7 +133,7 @@ class Q_AUTOTEST_EXPORT QQuickRotation : public QQuickTransform
     Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
     Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
 public:
-    QQuickRotation(QObject *parent = 0);
+    QQuickRotation(QObject *parent = nullptr);
     ~QQuickRotation();
 
     QVector3D origin() const;
@@ -164,7 +164,7 @@ class Q_AUTOTEST_EXPORT QQuickMatrix4x4 : public QQuickTransform
 
     Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged)
 public:
-    QQuickMatrix4x4(QObject *parent = 0);
+    QQuickMatrix4x4(QObject *parent = nullptr);
     ~QQuickMatrix4x4();
 
     QMatrix4x4 matrix() const;
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index ff9789ad57..1ac6c768e8 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -76,7 +76,7 @@ void QQuickViewPrivate::init(QQmlEngine* e)
 }
 
 QQuickViewPrivate::QQuickViewPrivate()
-    : root(0), component(0), resizeMode(QQuickView::SizeViewToRootObject), initialSize(0,0)
+    : root(nullptr), component(nullptr), resizeMode(QQuickView::SizeViewToRootObject), initialSize(0,0)
 {
 }
 
@@ -94,11 +94,11 @@ void QQuickViewPrivate::execute()
 
     if (root) {
         delete root;
-        root = 0;
+        root = nullptr;
     }
     if (component) {
         delete component;
-        component = 0;
+        component = nullptr;
     }
     if (!source.isEmpty()) {
         QML_MEMORY_SCOPE_URL(engine.data()->baseUrl().resolved(source));
@@ -216,7 +216,7 @@ QQuickView::~QQuickView()
     // be a child of the QQuickViewPrivate, and will be destroyed by its dtor
     Q_D(QQuickView);
     delete d->root;
-    d->root = 0;
+    d->root = nullptr;
 }
 
 /*!
@@ -260,7 +260,7 @@ void QQuickView::setContent(const QUrl& url, QQmlComponent *component, QObject*
     if (d->component && d->component->isError()) {
         const QList<QQmlError> errorList = d->component->errors();
         for (const QQmlError &error : errorList) {
-            QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), 0).warning()
+            QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), nullptr).warning()
                     << error;
         }
         emit statusChanged(status());
@@ -289,7 +289,7 @@ QUrl QQuickView::source() const
 QQmlEngine* QQuickView::engine() const
 {
     Q_D(const QQuickView);
-    return d->engine ? const_cast<QQmlEngine *>(d->engine.data()) : 0;
+    return d->engine ? const_cast<QQmlEngine *>(d->engine.data()) : nullptr;
 }
 
 /*!
@@ -302,7 +302,7 @@ QQmlEngine* QQuickView::engine() const
 QQmlContext* QQuickView::rootContext() const
 {
     Q_D(const QQuickView);
-    return d->engine ? d->engine.data()->rootContext() : 0;
+    return d->engine ? d->engine.data()->rootContext() : nullptr;
 }
 
 /*!
@@ -471,7 +471,7 @@ void QQuickView::continueExecute()
     if (d->component->isError()) {
         const QList<QQmlError> errorList = d->component->errors();
         for (const QQmlError &error : errorList) {
-            QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), 0).warning()
+            QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), nullptr).warning()
                     << error;
         }
         emit statusChanged(status());
@@ -483,7 +483,7 @@ void QQuickView::continueExecute()
     if (d->component->isError()) {
         const QList<QQmlError> errorList = d->component->errors();
         for (const QQmlError &error : errorList) {
-            QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), 0).warning()
+            QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), nullptr).warning()
                     << error;
         }
         emit statusChanged(status());
@@ -517,7 +517,7 @@ void QQuickViewPrivate::setRootObject(QObject *obj)
                    << "Ensure your QML code is written for QtQuick 2, and uses a root that is or" << endl
                    << "inherits from QtQuick's Item (not a Timer, QtObject, etc)." << endl;
         delete obj;
-        root = 0;
+        root = nullptr;
     }
     if (root) {
         initialSize = rootObjectSize();
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index f92d4b95d6..3f284c0519 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -93,7 +93,7 @@ public:
     void updateSize();
     void setRootObject(QObject *);
 
-    void init(QQmlEngine* e = 0);
+    void init(QQmlEngine* e = nullptr);
 
     QSize rootObjectSize() const;
 
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index c1148c00d1..aefdaea2b7 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -485,25 +485,25 @@ void QQuickWindowPrivate::renderSceneGraph(const QSize &size)
 }
 
 QQuickWindowPrivate::QQuickWindowPrivate()
-    : contentItem(0)
-    , activeFocusItem(0)
+    : contentItem(nullptr)
+    , activeFocusItem(nullptr)
 #if QT_CONFIG(cursor)
-    , cursorItem(0)
+    , cursorItem(nullptr)
 #endif
 #if QT_CONFIG(draganddrop)
-    , dragGrabber(0)
+    , dragGrabber(nullptr)
 #endif
     , touchMouseId(-1)
     , touchMouseDevice(nullptr)
     , touchMousePressTimestamp(0)
-    , dirtyItemList(0)
+    , dirtyItemList(nullptr)
     , devicePixelRatio(0)
-    , context(0)
-    , renderer(0)
-    , windowManager(0)
-    , renderControl(0)
+    , context(nullptr)
+    , renderer(nullptr)
+    , windowManager(nullptr)
+    , renderControl(nullptr)
     , pointerEventRecursionGuard(0)
-    , customRenderStage(0)
+    , customRenderStage(nullptr)
     , clearColor(Qt::white)
     , clearBeforeRendering(true)
     , persistentGLContext(true)
@@ -513,10 +513,10 @@ QQuickWindowPrivate::QQuickWindowPrivate()
     , allowChildEventFiltering(true)
     , allowDoubleClick(true)
     , lastFocusReason(Qt::OtherFocusReason)
-    , renderTarget(0)
+    , renderTarget(nullptr)
     , renderTargetId(0)
-    , vaoHelper(0)
-    , incubationController(0)
+    , vaoHelper(nullptr)
+    , incubationController(nullptr)
 {
 #if QT_CONFIG(draganddrop)
     dragGrabber = new QQuickDragGrabber;
@@ -602,7 +602,7 @@ void QQuickWindow::handleApplicationStateChanged(Qt::ApplicationState state)
 
 QQmlListProperty<QObject> QQuickWindowPrivate::data()
 {
-    return QQmlListProperty<QObject>(q_func(), 0, QQuickWindowPrivate::data_append,
+    return QQmlListProperty<QObject>(q_func(), nullptr, QQuickWindowPrivate::data_append,
                                              QQuickWindowPrivate::data_count,
                                              QQuickWindowPrivate::data_at,
                                              QQuickWindowPrivate::data_clear);
@@ -889,12 +889,12 @@ void QQuickWindowPrivate::setFocusInScope(QQuickItem *scope, QQuickItem *item, Q
     qCDebug(DBG_FOCUS) << "    item:" << (QObject *)item;
     qCDebug(DBG_FOCUS) << "    activeFocusItem:" << (QObject *)activeFocusItem;
 
-    QQuickItemPrivate *scopePrivate = scope ? QQuickItemPrivate::get(scope) : 0;
+    QQuickItemPrivate *scopePrivate = scope ? QQuickItemPrivate::get(scope) : nullptr;
     QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
 
-    QQuickItem *oldActiveFocusItem = 0;
+    QQuickItem *oldActiveFocusItem = nullptr;
     QQuickItem *currentActiveFocusItem = activeFocusItem;
-    QQuickItem *newActiveFocusItem = 0;
+    QQuickItem *newActiveFocusItem = nullptr;
     bool sendFocusIn = false;
 
     lastFocusReason = reason;
@@ -920,7 +920,7 @@ void QQuickWindowPrivate::setFocusInScope(QQuickItem *scope, QQuickItem *item, Q
             QGuiApplication::inputMethod()->commit();
 #endif
 
-            activeFocusItem = 0;
+            activeFocusItem = nullptr;
 
             QQuickItem *afi = oldActiveFocusItem;
             while (afi && afi != scope) {
@@ -1000,7 +1000,7 @@ void QQuickWindowPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item,
     qCDebug(DBG_FOCUS) << "    item:" << (QObject *)item;
     qCDebug(DBG_FOCUS) << "    activeFocusItem:" << (QObject *)activeFocusItem;
 
-    QQuickItemPrivate *scopePrivate = 0;
+    QQuickItemPrivate *scopePrivate = nullptr;
     if (scope) {
         scopePrivate = QQuickItemPrivate::get(scope);
         if ( !scopePrivate->subFocusItem )
@@ -1008,8 +1008,8 @@ void QQuickWindowPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item,
     }
 
     QQuickItem *currentActiveFocusItem = activeFocusItem;
-    QQuickItem *oldActiveFocusItem = 0;
-    QQuickItem *newActiveFocusItem = 0;
+    QQuickItem *oldActiveFocusItem = nullptr;
+    QQuickItem *newActiveFocusItem = nullptr;
 
     lastFocusReason = reason;
 
@@ -1026,7 +1026,7 @@ void QQuickWindowPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item,
         QGuiApplication::inputMethod()->commit();
 #endif
 
-        activeFocusItem = 0;
+        activeFocusItem = nullptr;
 
         if (oldActiveFocusItem) {
             QQuickItem *afi = oldActiveFocusItem;
@@ -1275,7 +1275,7 @@ QQuickWindow::QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent)
     \internal
 */
 QQuickWindow::QQuickWindow(QQuickRenderControl *control)
-    : QWindow(*(new QQuickWindowPrivate), 0)
+    : QWindow(*(new QQuickWindowPrivate), nullptr)
 {
     Q_D(QQuickWindow);
     d->init(this, control);
@@ -1285,7 +1285,7 @@ QQuickWindow::QQuickWindow(QQuickRenderControl *control)
     \internal
 */
 QQuickWindow::QQuickWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control)
-    : QWindow(dd, 0)
+    : QWindow(dd, nullptr)
 {
     Q_D(QQuickWindow);
     d->init(this, control);
@@ -1305,11 +1305,11 @@ QQuickWindow::~QQuickWindow()
         d->windowManager->windowDestroyed(this);
     }
 
-    delete d->incubationController; d->incubationController = 0;
+    delete d->incubationController; d->incubationController = nullptr;
 #if QT_CONFIG(draganddrop)
-    delete d->dragGrabber; d->dragGrabber = 0;
+    delete d->dragGrabber; d->dragGrabber = nullptr;
 #endif
-    delete d->contentItem; d->contentItem = 0;
+    delete d->contentItem; d->contentItem = nullptr;
     qDeleteAll(d->pointerEventInstances);
     d->pointerEventInstances.clear();
 
@@ -2762,7 +2762,7 @@ QQuickItem *QQuickWindowPrivate::findCursorItem(QQuickItem *item, const QPointF
     if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         QPointF p = item->mapFromScene(scenePos);
         if (!item->contains(p))
-            return 0;
+            return nullptr;
     }
 
     if (itemPrivate->subtreeCursorEnabled) {
@@ -2781,7 +2781,7 @@ QQuickItem *QQuickWindowPrivate::findCursorItem(QQuickItem *item, const QPointF
         if (item->contains(p))
             return item;
     }
-    return 0;
+    return nullptr;
 }
 #endif
 
@@ -3107,15 +3107,15 @@ void QQuickWindowPrivate::cleanupNodesOnShutdown(QQuickItem *item)
     QQuickItemPrivate *p = QQuickItemPrivate::get(item);
     if (p->itemNodeInstance) {
         delete p->itemNodeInstance;
-        p->itemNodeInstance = 0;
+        p->itemNodeInstance = nullptr;
 
         if (p->extra.isAllocated()) {
-            p->extra->opacityNode = 0;
-            p->extra->clipNode = 0;
-            p->extra->rootNode = 0;
+            p->extra->opacityNode = nullptr;
+            p->extra->clipNode = nullptr;
+            p->extra->rootNode = nullptr;
         }
 
-        p->paintNode = 0;
+        p->paintNode = nullptr;
 
         p->dirty(QQuickItemPrivate::Window);
     }
@@ -3127,7 +3127,7 @@ void QQuickWindowPrivate::cleanupNodesOnShutdown(QQuickItem *item)
         if (index >= 0) {
             const QMetaMethod &method = mo->method(index);
             // Skip functions named invalidateSceneGraph() in QML items.
-            if (strstr(method.enclosingMetaObject()->className(), "_QML_") == 0)
+            if (strstr(method.enclosingMetaObject()->className(), "_QML_") == nullptr)
                 method.invoke(item, Qt::DirectConnection);
         }
     }
@@ -3155,7 +3155,7 @@ void QQuickWindowPrivate::updateDirtyNodes()
     cleanupNodes();
 
     QQuickItem *updateList = dirtyItemList;
-    dirtyItemList = 0;
+    dirtyItemList = nullptr;
     if (updateList) QQuickItemPrivate::get(updateList)->prevDirtyItem = &updateList;
 
     while (updateList) {
@@ -3171,7 +3171,7 @@ void QQuickWindowPrivate::updateDirtyNodes()
 static inline QSGNode *qquickitem_before_paintNode(QQuickItemPrivate *d)
 {
     const QList<QQuickItem *> childItems = d->paintOrderChildItems();
-    QQuickItem *before = 0;
+    QQuickItem *before = nullptr;
     for (int i=0; i<childItems.size(); ++i) {
         QQuickItemPrivate *dd = QQuickItemPrivate::get(childItems.at(i));
         // Perform the same check as the in fetchNextNode below.
@@ -3180,7 +3180,7 @@ static inline QSGNode *qquickitem_before_paintNode(QQuickItemPrivate *d)
         else
             break;
     }
-    return Q_UNLIKELY(before) ? QQuickItemPrivate::get(before)->itemNode() : 0;
+    return Q_UNLIKELY(before) ? QQuickItemPrivate::get(before)->itemNode() : nullptr;
 }
 
 static QSGNode *fetchNextNode(QQuickItemPrivate *itemPriv, int &ii, bool &returnedPaintNode)
@@ -3212,7 +3212,7 @@ static QSGNode *fetchNextNode(QQuickItemPrivate *itemPriv, int &ii, bool &return
         return childPrivate->itemNode();
     }
 
-    return 0;
+    return nullptr;
 }
 
 void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
@@ -3247,10 +3247,10 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
     }
 
     bool clipEffectivelyChanged = (dirty & (QQuickItemPrivate::Clip | QQuickItemPrivate::Window)) &&
-                                  ((item->clip() == false) != (itemPriv->clipNode() == 0));
+                                  ((item->clip() == false) != (itemPriv->clipNode() == nullptr));
     int effectRefCount = itemPriv->extra.isAllocated()?itemPriv->extra->effectRefCount:0;
     bool effectRefEffectivelyChanged = (dirty & (QQuickItemPrivate::EffectReference | QQuickItemPrivate::Window)) &&
-                                  ((effectRefCount == 0) != (itemPriv->rootNode() == 0));
+                                  ((effectRefCount == 0) != (itemPriv->rootNode() == nullptr));
 
     if (clipEffectivelyChanged) {
         QSGNode *parent = itemPriv->opacityNode() ? (QSGNode *) itemPriv->opacityNode() :
@@ -3258,7 +3258,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
         QSGNode *child = itemPriv->rootNode();
 
         if (item->clip()) {
-            Q_ASSERT(itemPriv->clipNode() == 0);
+            Q_ASSERT(itemPriv->clipNode() == nullptr);
             QQuickDefaultClipNode *clip = new QQuickDefaultClipNode(item->clipRect());
             itemPriv->extra.value().clipNode = clip;
             clip->update();
@@ -3284,7 +3284,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
             }
 
             delete itemPriv->clipNode();
-            itemPriv->extra->clipNode = 0;
+            itemPriv->extra->clipNode = nullptr;
         }
     }
 
@@ -3299,18 +3299,18 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
             parent = itemPriv->itemNode();
 
         if (itemPriv->extra.isAllocated() && itemPriv->extra->effectRefCount) {
-            Q_ASSERT(itemPriv->rootNode() == 0);
+            Q_ASSERT(itemPriv->rootNode() == nullptr);
             QSGRootNode *root = new QSGRootNode();
             itemPriv->extra->rootNode = root;
             parent->reparentChildNodesTo(root);
             parent->appendChildNode(root);
         } else {
-            Q_ASSERT(itemPriv->rootNode() != 0);
+            Q_ASSERT(itemPriv->rootNode() != nullptr);
             QSGRootNode *root = itemPriv->rootNode();
             parent->removeChildNode(root);
             root->reparentChildNodesTo(parent);
             delete itemPriv->rootNode();
-            itemPriv->extra->rootNode = 0;
+            itemPriv->extra->rootNode = nullptr;
         }
     }
 
@@ -3336,7 +3336,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
         int added = 0;
         int removed = 0;
         int replaced = 0;
-        QSGNode *desiredNode = 0;
+        QSGNode *desiredNode = nullptr;
 
         while (currentNode && (desiredNode = fetchNextNode(itemPriv, ii, fetchedPaintNode))) {
             // uh oh... reality and our utopic paradise are diverging!
@@ -3421,11 +3421,11 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
             updatePaintNodeData.transformNode = itemPriv->itemNode();
             itemPriv->paintNode = item->updatePaintNode(itemPriv->paintNode, &updatePaintNodeData);
 
-            Q_ASSERT(itemPriv->paintNode == 0 ||
-                     itemPriv->paintNode->parent() == 0 ||
+            Q_ASSERT(itemPriv->paintNode == nullptr ||
+                     itemPriv->paintNode->parent() == nullptr ||
                      itemPriv->paintNode->parent() == itemPriv->childContainerNode());
 
-            if (itemPriv->paintNode && itemPriv->paintNode->parent() == 0) {
+            if (itemPriv->paintNode && itemPriv->paintNode->parent() == nullptr) {
                 QSGNode *before = qquickitem_before_paintNode(itemPriv);
                 if (before && before->parent()) {
                     Q_ASSERT(before->parent() == itemPriv->childContainerNode());
@@ -3436,7 +3436,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item)
             }
         } else if (itemPriv->paintNode) {
             delete itemPriv->paintNode;
-            itemPriv->paintNode = 0;
+            itemPriv->paintNode = nullptr;
         }
     }
 
@@ -3488,14 +3488,14 @@ void QQuickWindow::cleanupSceneGraph()
     Q_D(QQuickWindow);
 #if QT_CONFIG(opengl)
     delete d->vaoHelper;
-    d->vaoHelper = 0;
+    d->vaoHelper = nullptr;
 #endif
     if (!d->renderer)
         return;
 
     delete d->renderer->rootNode();
     delete d->renderer;
-    d->renderer = 0;
+    d->renderer = nullptr;
 
     d->runAndClearJobs(&d->beforeSynchronizingJobs);
     d->runAndClearJobs(&d->afterSynchronizingJobs);
@@ -3545,7 +3545,7 @@ QOpenGLContext *QQuickWindow::openglContext() const
 bool QQuickWindow::isSceneGraphInitialized() const
 {
     Q_D(const QQuickWindow);
-    return d->context != 0 && d->context->isValid();
+    return d->context != nullptr && d->context->isValid();
 }
 
 /*!
@@ -3723,7 +3723,7 @@ void QQuickWindow::setRenderTarget(uint fboId, const QSize &size)
     d->renderTargetSize = size;
 
     // Unset any previously set instance...
-    d->renderTarget = 0;
+    d->renderTarget = nullptr;
 }
 
 
@@ -3837,7 +3837,7 @@ QQmlIncubationController *QQuickWindow::incubationController() const
     Q_D(const QQuickWindow);
 
     if (!d->windowManager)
-        return 0; // TODO: make sure that this is safe
+        return nullptr; // TODO: make sure that this is safe
 
     if (!d->incubationController)
         d->incubationController = new QQuickWindowIncubationController(d->windowManager);
@@ -4081,7 +4081,7 @@ bool QQuickWindow::clearBeforeRendering() const
 
 QSGTexture *QQuickWindow::createTextureFromImage(const QImage &image) const
 {
-    return createTextureFromImage(image, 0);
+    return createTextureFromImage(image, nullptr);
 }
 
 
@@ -4130,7 +4130,7 @@ QSGTexture *QQuickWindow::createTextureFromImage(const QImage &image, CreateText
 {
     Q_D(const QQuickWindow);
     if (!isSceneGraphInitialized()) // check both for d->context and d->context->isValid()
-         return 0;
+         return nullptr;
     uint flags = 0;
     if (options & TextureCanUseAtlas)     flags |= QSGRenderContext::CreateTexture_Atlas;
     if (options & TextureHasMipmaps)      flags |= QSGRenderContext::CreateTexture_Mipmap;
@@ -4176,7 +4176,7 @@ QSGTexture *QQuickWindow::createTextureFromId(uint id, const QSize &size, Create
     Q_UNUSED(size)
     Q_UNUSED(options)
 #endif
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -4290,7 +4290,7 @@ void QQuickWindow::resetOpenGLState()
         int maxAttribs;
         gl->glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxAttribs);
         for (int i=0; i<maxAttribs; ++i) {
-            gl->glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0);
+            gl->glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, nullptr);
             gl->glDisableVertexAttribArray(i);
         }
     }
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index ce9b98504c..cd5ff31994 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -116,7 +116,7 @@ public:
     QQuickWindowPrivate();
     virtual ~QQuickWindowPrivate();
 
-    void init(QQuickWindow *, QQuickRenderControl *control = 0);
+    void init(QQuickWindow *, QQuickRenderControl *control = nullptr);
 
     QQuickRootItem *contentItem;
     QSet<QQuickItem *> parentlessItems;
@@ -146,7 +146,7 @@ public:
     void grabTouchPoints(QObject *grabber, const QVector<int> &ids);
     void removeGrabber(QQuickItem *grabber, bool mouse = true, bool touch = true);
     void sendUngrabEvent(QQuickItem *grabber, bool touch);
-    static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0);
+    static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = nullptr);
     void deliverToPassiveGrabbers(const QVector<QPointer <QQuickPointerHandler> > &passiveGrabbers, QQuickPointerEvent *pointerEvent);
     void deliverMouseEvent(QQuickPointerMouseEvent *pointerEvent);
     bool sendFilteredMouseEvent(QEvent *event, QQuickItem *receiver, QQuickItem *filteringParent);
@@ -205,8 +205,8 @@ public:
     };
     Q_DECLARE_FLAGS(FocusOptions, FocusOption)
 
-    void setFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = 0);
-    void clearFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = 0);
+    void setFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = nullptr);
+    void clearFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = nullptr);
     static void notifyFocusChangesRecur(QQuickItem **item, int remaining);
     void clearFocusObject() override;
 
diff --git a/src/quick/items/qquickwindowattached.cpp b/src/quick/items/qquickwindowattached.cpp
index ae62a7a496..481366222d 100644
--- a/src/quick/items/qquickwindowattached.cpp
+++ b/src/quick/items/qquickwindowattached.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 QQuickWindowAttached::QQuickWindowAttached(QObject* attachee)
     : QObject(attachee)
-    , m_window(NULL)
+    , m_window(nullptr)
 {
     m_attachee = qobject_cast<QQuickItem*>(attachee);
     if (m_attachee && m_attachee->window()) // It might not be in a window yet
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index 00fc23645b..24467a3701 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -140,7 +140,7 @@ void QQmlQtQuick2DebugStatesDelegate::updateBinding(QQmlContext *context,
             if (state->isStateActive() && state->containsPropertyInRevertList(object, propertyName)) {
                 *inBaseState = false;
 
-                QQmlBinding *newBinding = 0;
+                QQmlBinding *newBinding = nullptr;
                 if (!isLiteralValue) {
                     newBinding = QQmlBinding::create(&QQmlPropertyPrivate::get(property)->core,
                                                      expression.toString(), object,
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp
index 92c02b4966..a8b5944974 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp
@@ -87,6 +87,6 @@ QSGRenderLoop *QSGSoftwareAdaptation::createWindowManager()
     return new QSGSoftwareRenderLoop();
 }
 
-QSGSoftwareContext *QSGSoftwareAdaptation::instance = 0;
+QSGSoftwareContext *QSGSoftwareAdaptation::instance = nullptr;
 
 QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation_p.h
index ffe54b5d4b..8b2a545033 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation_p.h
@@ -62,7 +62,7 @@ class QSGSoftwareContext;
 class QSGSoftwareAdaptation : public QSGContextPlugin
 {
 public:
-    QSGSoftwareAdaptation(QObject *parent = 0);
+    QSGSoftwareAdaptation(QObject *parent = nullptr);
 
     QStringList keys() const override;
     QSGContext *create(const QString &key) const override;
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp
index aa850a80db..5b5bf005d8 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp
@@ -205,12 +205,12 @@ QSGRendererInterface::ShaderType QSGSoftwareContext::shaderType() const
 
 QSGRendererInterface::ShaderCompilationTypes QSGSoftwareContext::shaderCompilationType() const
 {
-    return 0;
+    return nullptr;
 }
 
 QSGRendererInterface::ShaderSourceTypes QSGSoftwareContext::shaderSourceType() const
 {
-    return 0;
+    return nullptr;
 }
 
 void *QSGSoftwareContext::getResource(QQuickWindow *window, Resource resource) const
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp
index 8843b6450a..3b0f3c48ff 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp
@@ -318,7 +318,7 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
 QSGSoftwareInternalImageNode::QSGSoftwareInternalImageNode()
     : m_innerSourceRect(0, 0, 1, 1)
     , m_subSourceRect(0, 0, 1, 1)
-    , m_texture(0)
+    , m_texture(nullptr)
     , m_mirror(false)
     , m_smooth(true)
     , m_tileHorizontal(false)
@@ -462,7 +462,7 @@ void QSGSoftwareInternalImageNode::paint(QPainter *painter)
                          m_targetRect.right() - m_innerTargetRect.right(), m_targetRect.bottom() - m_innerTargetRect.bottom());
         QSGSoftwareHelpers::QTileRules tilerules(getTileRule(m_subSourceRect.width()), getTileRule(m_subSourceRect.height()));
         QSGSoftwareHelpers::qDrawBorderPixmap(painter, m_targetRect.toRect(), margins, pm, QRect(0, 0, pm.width(), pm.height()),
-                                              margins, tilerules, QSGSoftwareHelpers::QDrawBorderPixmap::DrawingHints(0));
+                                              margins, tilerules, QSGSoftwareHelpers::QDrawBorderPixmap::DrawingHints(nullptr));
         return;
     }
 
@@ -494,7 +494,7 @@ const QPixmap &QSGSoftwareInternalImageNode::pixmap() const
         return pt->pixmap();
     if (QSGSoftwareLayer *layer = qobject_cast<QSGSoftwareLayer*>(m_texture))
         return layer->pixmap();
-    Q_ASSERT(m_texture == 0);
+    Q_ASSERT(m_texture == nullptr);
     static const QPixmap nullPixmap;
     return nullPixmap;
 }
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
index 9d30c43f87..b4301451d8 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
@@ -45,9 +45,9 @@
 QT_BEGIN_NAMESPACE
 
 QSGSoftwareLayer::QSGSoftwareLayer(QSGRenderContext *renderContext)
-    : m_item(0)
+    : m_item(nullptr)
     , m_context(renderContext)
-    , m_renderer(0)
+    , m_renderer(nullptr)
     , m_device_pixel_ratio(1)
     , m_mirrorHorizontal(false)
     , m_mirrorVertical(true)
@@ -203,7 +203,7 @@ void QSGSoftwareLayer::markDirtyTexture()
 void QSGSoftwareLayer::invalidated()
 {
     delete m_renderer;
-    m_renderer = 0;
+    m_renderer = nullptr;
 }
 
 void QSGSoftwareLayer::grab()
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode.cpp
index 34b0cd5b72..60ae06dd94 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode.cpp
@@ -47,7 +47,7 @@ QSGSoftwarePainterNode::QSGSoftwarePainterNode(QQuickPaintedItem *item)
     : QSGPainterNode()
     , m_preferredRenderTarget(QQuickPaintedItem::Image)
     , m_item(item)
-    , m_texture(0)
+    , m_texture(nullptr)
     , m_dirtyContents(false)
     , m_opaquePainting(false)
     , m_linear_filtering(false)
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp
index 77d21ec042..1463681fa3 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp
@@ -188,7 +188,7 @@ void QSGSoftwareNinePatchNode::paint(QPainter *painter)
         painter->drawPixmap(m_bounds, m_pixmap, QRectF(0, 0, m_pixmap.width(), m_pixmap.height()));
     else
         QSGSoftwareHelpers::qDrawBorderPixmap(painter, m_bounds.toRect(), m_margins, m_pixmap, QRect(0, 0, m_pixmap.width(), m_pixmap.height()),
-                                              m_margins, Qt::StretchTile, QSGSoftwareHelpers::QDrawBorderPixmap::DrawingHints(0));
+                                              m_margins, Qt::StretchTile, QSGSoftwareHelpers::QDrawBorderPixmap::DrawingHints(nullptr));
 }
 
 QRectF QSGSoftwareNinePatchNode::bounds() const
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
index a7485a90eb..f8973af2fb 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
@@ -294,7 +294,7 @@ bool QSGSoftwareRenderThread::event(QEvent *e)
                 }
                 rc->invalidate();
                 QCoreApplication::processEvents();
-                QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+                QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
                 if (wme->destroying)
                     delete wd->animationController;
             }
@@ -456,7 +456,7 @@ void QSGSoftwareRenderThread::sync(bool inExpose)
         // Process deferred deletes now, directly after the sync as deleteLater
         // on the GUI must now also have resulted in SG changes and the delete
         // is a safe operation.
-        QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+        QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
     }
 
     if (!inExpose) {
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp
index 301f2826dc..e868a4380e 100644
--- a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp
+++ b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp
@@ -84,7 +84,7 @@ Texture *Atlas::create(const QByteArray &data, int dataLength, int dataOffset, c
         m_pending_uploads << t;
         return t;
     }
-    return 0;
+    return nullptr;
 }
 
 void Atlas::generateTexture()
@@ -93,7 +93,7 @@ void Atlas::generateTexture()
     funcs->glCompressedTexImage2D(GL_TEXTURE_2D, 0, m_format,
                                   m_size.width(), m_size.height(), 0,
                                   (m_size.width() * m_size.height()) / 2,
-                                  0);
+                                  nullptr);
 }
 
 void Atlas::uploadPendingTexture(int i)
@@ -119,7 +119,7 @@ void Atlas::uploadPendingTexture(int i)
 
 Texture::Texture(Atlas *atlas, const QRect &textureRect, const QByteArray &data, int dataLength, int dataOffset, const QSize &size)
     : QSGAtlasTexture::TextureBase(atlas, textureRect)
-    , m_nonatlas_texture(0)
+    , m_nonatlas_texture(nullptr)
     , m_data(data)
     , m_size(size)
     , m_dataLength(dataLength)
diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp b/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
index 3d4ce24716..fddac7ed71 100644
--- a/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
@@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE
     \internal
  */
 QSGAbstractRendererPrivate::QSGAbstractRendererPrivate()
-    : m_root_node(0)
+    : m_root_node(nullptr)
     , m_clear_color(Qt::transparent)
     , m_clear_mode(QSGAbstractRenderer::ClearColorBuffer | QSGAbstractRenderer::ClearDepthBuffer)
 {
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 27b374e47f..ba71551302 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -155,10 +155,10 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material)
             p->bindAttributeLocation(attr[i], i);
     }
     p->bindAttributeLocation("_qt_order", i);
-    context->compileShader(s, material, qsgShaderRewriter_insertZAttributes(s->vertexShader(), profile), 0);
+    context->compileShader(s, material, qsgShaderRewriter_insertZAttributes(s->vertexShader(), profile), nullptr);
     context->initializeShader(s);
     if (!p->isLinked())
-        return 0;
+        return nullptr;
 
     shader = new Shader;
     shader->program = s;
@@ -215,7 +215,7 @@ void ShaderManager::invalidated()
     qDeleteAll(rewrittenShaders);
     rewrittenShaders.clear();
     delete blitProgram;
-    blitProgram = 0;
+    blitProgram = nullptr;
 }
 
 void qsg_dumpShadowRoots(BatchRootInfo *i, int indent)
@@ -280,7 +280,7 @@ Updater::Updater(Renderer *r)
 
 void Updater::updateStates(QSGNode *n)
 {
-    m_current_clip = 0;
+    m_current_clip = nullptr;
 
     m_added = 0;
     m_transformChange = 0;
@@ -347,7 +347,7 @@ void Updater::visitNode(Node *n)
 
     m_added = count;
     m_force_update = force;
-    n->dirtyState = 0;
+    n->dirtyState = nullptr;
 }
 
 void Updater::visitClipNode(Node *n)
@@ -473,7 +473,7 @@ void Updater::visitGeometryNode(Node *n)
 
         if (e->root) {
             BatchRootInfo *info = renderer->batchRootInfo(e->root);
-            while (info != 0) {
+            while (info != nullptr) {
                 info->availableOrders--;
                 if (info->availableOrders < 0) {
                     renderer->m_rebuild |= Renderer::BuildRenderLists;
@@ -481,10 +481,10 @@ void Updater::visitGeometryNode(Node *n)
                     renderer->m_rebuild |= Renderer::BuildRenderListsForTaggedRoots;
                     renderer->m_taggedRoots << e->root;
                 }
-                if (info->parentRoot != 0)
+                if (info->parentRoot != nullptr)
                     info = renderer->batchRootInfo(info->parentRoot);
                 else
-                    info = 0;
+                    info = nullptr;
             }
         } else {
             renderer->m_rebuild |= Renderer::FullRebuild;
@@ -680,12 +680,12 @@ void Batch::invalidate()
     // the batch to do an early out..
     cleanupRemovedElements();
     Element *e = first;
-    first = 0;
-    root = 0;
+    first = nullptr;
+    root = nullptr;
     while (e) {
-        e->batch = 0;
+        e->batch = nullptr;
         Element *n = e->nextInBatch;
-        e->nextInBatch = 0;
+        e->nextInBatch = nullptr;
         e = n;
     }
 }
@@ -756,7 +756,7 @@ Renderer::Renderer(QSGDefaultRenderContext *ctx)
     , m_alphaRenderList(64)
     , m_nextRenderOrder(0)
     , m_partialRebuild(false)
-    , m_partialRebuildRoot(0)
+    , m_partialRebuildRoot(nullptr)
     , m_useDepthBuffer(true)
     , m_opaqueBatches(16)
     , m_alphaBatches(16)
@@ -768,17 +768,17 @@ Renderer::Renderer(QSGDefaultRenderContext *ctx)
     , m_zRange(0)
     , m_renderOrderRebuildLower(-1)
     , m_renderOrderRebuildUpper(-1)
-    , m_currentMaterial(0)
-    , m_currentShader(0)
+    , m_currentMaterial(nullptr)
+    , m_currentShader(nullptr)
     , m_currentStencilValue(0)
     , m_clipMatrixId(0)
-    , m_currentClip(0)
+    , m_currentClip(nullptr)
     , m_currentClipType(NoClip)
     , m_vertexUploadPool(256)
 #ifdef QSG_SEPARATE_INDEX_BUFFER
     , m_indexUploadPool(64)
 #endif
-    , m_vao(0)
+    , m_vao(nullptr)
     , m_visualizeMode(VisualizeNothing)
 {
     initializeOpenGLFunctions();
@@ -916,7 +916,7 @@ void Renderer::unmap(Buffer *buffer, bool isIndexBuf)
     glBufferData(target, buffer->size, buffer->data, m_bufferStrategy);
 
     if (!m_context->hasBrokenIndexBufferObjects() && m_visualizeMode == VisualizeNothing) {
-        buffer->data = 0;
+        buffer->data = nullptr;
     }
 }
 
@@ -944,7 +944,7 @@ void Renderer::removeBatchRootFromParent(Node *childRoot)
 
     Q_ASSERT(parentInfo->subRoots.contains(childRoot));
     parentInfo->subRoots.remove(childRoot);
-    childInfo->parentRoot = 0;
+    childInfo->parentRoot = nullptr;
 }
 
 void Renderer::registerBatchRoot(Node *subRoot, Node *parentRoot)
@@ -1072,7 +1072,7 @@ void Renderer::nodeWasRemoved(Node *node)
         if (e) {
             e->removed = true;
             m_elementsToDelete.add(e);
-            e->node = 0;
+            e->node = nullptr;
             if (e->root) {
                 BatchRootInfo *info = batchRootInfo(e->root);
                 info->availableOrders++;
@@ -1185,7 +1185,7 @@ void Renderer::nodeChanged(QSGNode *node, QSGNode::DirtyState state)
             return;
         }
         if (node == rootNode())
-            nodeWasAdded(node, 0);
+            nodeWasAdded(node, nullptr);
         else
             nodeWasAdded(node, m_nodes.value(node->parent()));
     }
@@ -1438,7 +1438,7 @@ void Renderer::buildRenderListsForTaggedRoots()
         }
     }
     m_partialRebuild = false;
-    m_partialRebuildRoot = 0;
+    m_partialRebuildRoot = nullptr;
     m_taggedRoots.clear();
     m_nextRenderOrder = qMax(m_nextRenderOrder, maxRenderOrder);
 
@@ -2144,7 +2144,7 @@ Renderer::ClipType Renderer::updateStencilClip(const QSGClipNode *clip)
                     glBufferSubData(GL_ARRAY_BUFFER, 0, vertexByteSize, g->vertexData());
                 }
 
-                pointer = 0;
+                pointer = nullptr;
             }
 
             glVertexAttribPointer(0, a->tupleSize, a->type, GL_FALSE, g->sizeOfVertex(), pointer);
@@ -2186,7 +2186,7 @@ void Renderer::updateClip(const QSGClipNode *clipList, const Batch *batch)
         m_currentClip = clipList;
         // updateClip sets another program, so force-reactivate our own
         if (m_currentShader)
-            setActiveShader(0, 0);
+            setActiveShader(nullptr, nullptr);
         glBindBuffer(GL_ARRAY_BUFFER, 0);
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
         if (batch->isOpaque)
@@ -2207,8 +2207,8 @@ void Renderer::updateClip(const QSGClipNode *clipList, const Batch *batch)
  */
 void Renderer::setActiveShader(QSGMaterialShader *program, ShaderManager::Shader *shader)
 {
-    const char * const *c = m_currentProgram ? m_currentProgram->attributeNames() : 0;
-    const char * const *n = program ? program->attributeNames() : 0;
+    const char * const *c = m_currentProgram ? m_currentProgram->attributeNames() : nullptr;
+    const char * const *n = program ? program->attributeNames() : nullptr;
 
     int cza = m_currentShader ? m_currentShader->pos_order : -1;
     int nza = shader ? shader->pos_order : -1;
@@ -2219,18 +2219,18 @@ void Renderer::setActiveShader(QSGMaterialShader *program, ShaderManager::Shader
         bool was = c;
         if (cza == i) {
             was = true;
-            c = 0;
+            c = nullptr;
         } else if (c && !c[i]) { // end of the attribute array names
-            c = 0;
+            c = nullptr;
             was = false;
         }
 
         bool is = n;
         if (nza == i) {
             is = true;
-            n = 0;
+            n = nullptr;
         } else if (n && !n[i]) {
-            n = 0;
+            n = nullptr;
             is = false;
         }
 
@@ -2246,7 +2246,7 @@ void Renderer::setActiveShader(QSGMaterialShader *program, ShaderManager::Shader
         m_currentProgram->deactivate();
     m_currentProgram = program;
     m_currentShader = shader;
-    m_currentMaterial = 0;
+    m_currentMaterial = nullptr;
     if (m_currentProgram) {
         m_currentProgram->program()->bind();
         m_currentProgram->activate();
@@ -2298,7 +2298,7 @@ void Renderer::renderMergedBatch(const Batch *batch)
 
     glBindBuffer(GL_ARRAY_BUFFER, batch->vbo.id);
 
-    char *indexBase = 0;
+    char *indexBase = nullptr;
 #ifdef QSG_SEPARATE_INDEX_BUFFER
     const Buffer *indexBuf = &batch->ibo;
 #else
@@ -2394,7 +2394,7 @@ void Renderer::renderUnmergedBatch(const Batch *batch)
     updateClip(gn->clipList(), batch);
 
     glBindBuffer(GL_ARRAY_BUFFER, batch->vbo.id);
-    char *indexBase = 0;
+    char *indexBase = nullptr;
 #ifdef QSG_SEPARATE_INDEX_BUFFER
     const Buffer *indexBuf = &batch->ibo;
 #else
@@ -2500,8 +2500,8 @@ void Renderer::updateLineWidth(QSGGeometry *g)
     else {
         QOpenGLContext *ctx = m_context->openglContext();
         if (!ctx->isOpenGLES() && g->drawingMode() == GL_POINTS) {
-            QOpenGLFunctions_1_0 *gl1funcs = 0;
-            QOpenGLFunctions_3_2_Core *gl3funcs = 0;
+            QOpenGLFunctions_1_0 *gl1funcs = nullptr;
+            QOpenGLFunctions_3_2_Core *gl3funcs = nullptr;
             if (ctx->format().profile() == QSurfaceFormat::CoreProfile)
                 gl3funcs = ctx->versionFunctions<QOpenGLFunctions_3_2_Core>();
             else
@@ -2546,10 +2546,10 @@ void Renderer::renderBatches()
     bindable()->clear(clearMode());
 
     m_current_opacity = 1;
-    m_currentMaterial = 0;
-    m_currentShader = 0;
-    m_currentProgram = 0;
-    m_currentClip = 0;
+    m_currentMaterial = nullptr;
+    m_currentShader = nullptr;
+    m_currentProgram = nullptr;
+    m_currentClip = nullptr;
 
     bool renderOpaque = !debug_noopaque();
     bool renderAlpha = !debug_noalpha();
@@ -2582,8 +2582,8 @@ void Renderer::renderBatches()
     }
 
     if (m_currentShader)
-        setActiveShader(0, 0);
-    updateStencilClip(0);
+        setActiveShader(nullptr, nullptr);
+    updateStencilClip(nullptr);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
     glDepthMask(true);
@@ -2597,12 +2597,12 @@ void Renderer::deleteRemovedElements()
     for (int i=0; i<m_opaqueRenderList.size(); ++i) {
         Element **e = m_opaqueRenderList.data() + i;
         if (*e && (*e)->removed)
-            *e = 0;
+            *e = nullptr;
     }
     for (int i=0; i<m_alphaRenderList.size(); ++i) {
         Element **e = m_alphaRenderList.data() + i;
         if (*e && (*e)->removed)
-            *e = 0;
+            *e = nullptr;
     }
 
     for (int i=0; i<m_elementsToDelete.size(); ++i) {
@@ -2815,11 +2815,11 @@ void Renderer::renderRenderNode(Batch *batch)
     Q_ASSERT(batch->first->isRenderNode);
     RenderNodeElement *e = (RenderNodeElement *) batch->first;
 
-    setActiveShader(0, 0);
+    setActiveShader(nullptr, nullptr);
 
     QSGNode *clip = e->renderNode->parent();
     QSGRenderNodePrivate *rd = QSGRenderNodePrivate::get(e->renderNode);
-    rd->m_clip_list = 0;
+    rd->m_clip_list = nullptr;
     while (clip != rootNode()) {
         if (clip->type() == QSGNode::ClipNodeType) {
             rd->m_clip_list = static_cast<QSGClipNode *>(clip);
@@ -2883,8 +2883,8 @@ void Renderer::renderRenderNode(Batch *batch)
 
     e->renderNode->render(&state);
 
-    rd->m_matrix = 0;
-    rd->m_clip_list = 0;
+    rd->m_matrix = nullptr;
+    rd->m_clip_list = nullptr;
 
     if (changes & QSGRenderNode::ViewportState) {
         QRect r = viewportRect();
@@ -2899,7 +2899,7 @@ void Renderer::renderRenderNode(Batch *batch)
 
     if (changes & (QSGRenderNode::StencilState | QSGRenderNode::ScissorState)) {
         glDisable(GL_SCISSOR_TEST);
-        m_currentClip = 0;
+        m_currentClip = nullptr;
         m_currentClipType = NoClip;
     }
 
@@ -3069,7 +3069,7 @@ void Renderer::visualizeChanges(Node *n)
         // This is because many changes don't propegate their dirty state to the
         // parent so the node updater will not unset these states. They are
         // not used for anything so, unsetting it should have no side effects.
-        n->dirtyState = 0;
+        n->dirtyState = nullptr;
     }
 
     SHADOWNODE_TRAVERSE(n) {
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index e99af2f4ef..46753e8087 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -306,10 +306,10 @@ struct Buffer {
 struct Element {
 
     Element()
-        : node(0)
-        , batch(0)
-        , nextInBatch(0)
-        , root(0)
+        : node(nullptr)
+        , batch(nullptr)
+        , nextInBatch(nullptr)
+        , root(nullptr)
         , order(0)
         , boundsComputed(false)
         , boundsOutsideFloatRange(false)
@@ -362,7 +362,7 @@ struct RenderNodeElement : public Element {
 };
 
 struct BatchRootInfo {
-    BatchRootInfo() : parentRoot(0), lastOrder(-1), firstOrder(-1), availableOrders(0) { }
+    BatchRootInfo() : parentRoot(nullptr), lastOrder(-1), firstOrder(-1), availableOrders(0) { }
     QSet<Node *> subRoots;
     Node *parentRoot;
     int lastOrder;
@@ -410,8 +410,8 @@ struct Batch
 
     // pseudo-constructor...
     void init() {
-        first = 0;
-        root = 0;
+        first = nullptr;
+        root = nullptr;
         vertexCount = 0;
         indexCount = 0;
         isOpaque = false;
@@ -463,9 +463,9 @@ struct Node
     void append(Node *child) {
         Q_ASSERT(child);
         Q_ASSERT(!hasChild(child));
-        Q_ASSERT(child->m_parent == 0);
-        Q_ASSERT(child->m_next == 0);
-        Q_ASSERT(child->m_prev == 0);
+        Q_ASSERT(child->m_parent == nullptr);
+        Q_ASSERT(child->m_next == nullptr);
+        Q_ASSERT(child->m_prev == nullptr);
 
         if (!m_child) {
             child->m_next = child;
@@ -486,27 +486,27 @@ struct Node
 
         // only child..
         if (child->m_next == child) {
-            m_child = 0;
+            m_child = nullptr;
         } else {
             if (m_child == child)
                 m_child = child->m_next;
             child->m_next->m_prev = child->m_prev;
             child->m_prev->m_next = child->m_next;
         }
-        child->m_next = 0;
-        child->m_prev = 0;
-        child->setParent(0);
+        child->m_next = nullptr;
+        child->m_prev = nullptr;
+        child->setParent(nullptr);
     }
 
     Node *firstChild() const { return m_child; }
 
     Node *sibling() const {
         Q_ASSERT(m_parent);
-        return m_next == m_parent->m_child ? 0 : m_next;
+        return m_next == m_parent->m_child ? nullptr : m_next;
     }
 
     void setParent(Node *p) {
-        Q_ASSERT(m_parent == 0 || p == 0);
+        Q_ASSERT(m_parent == nullptr || p == nullptr);
         m_parent = p;
     }
 
@@ -591,7 +591,7 @@ public:
         float lastOpacity;
     };
 
-    ShaderManager(QSGDefaultRenderContext *ctx) : visualizeProgram(0), blitProgram(0), context(ctx) { }
+    ShaderManager(QSGDefaultRenderContext *ctx) : visualizeProgram(nullptr), blitProgram(nullptr), context(ctx) { }
     ~ShaderManager() {
         qDeleteAll(rewrittenShaders);
         qDeleteAll(stockShaders);
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp
index 52366bfc35..226709094d 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry.cpp
+++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp
@@ -430,9 +430,9 @@ QSGGeometry::QSGGeometry(const QSGGeometry::AttributeSet &attributes,
     , m_index_count(0)
     , m_index_type(indexType)
     , m_attributes(attributes)
-    , m_data(0)
+    , m_data(nullptr)
     , m_index_data_offset(-1)
-    , m_server_data(0)
+    , m_server_data(nullptr)
     , m_owns_data(false)
     , m_index_usage_pattern(AlwaysUploadPattern)
     , m_vertex_usage_pattern(AlwaysUploadPattern)
@@ -529,7 +529,7 @@ QSGGeometry::~QSGGeometry()
 void *QSGGeometry::indexData()
 {
     return m_index_data_offset < 0
-            ? 0
+            ? nullptr
             : ((char *) m_data + m_index_data_offset);
 }
 
@@ -541,7 +541,7 @@ void *QSGGeometry::indexData()
 const void *QSGGeometry::indexData() const
 {
     return m_index_data_offset < 0
-            ? 0
+            ? nullptr
             : ((char *) m_data + m_index_data_offset);
 }
 
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 5c28f4c82f..8557de1b1f 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -641,7 +641,7 @@ static void qt_print_material_count()
  */
 
 QSGMaterial::QSGMaterial()
-    : m_flags(0)
+    : m_flags(nullptr)
 {
     Q_UNUSED(m_reserved);
 #ifndef QT_NO_DEBUG
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 550a2182f8..10d4e2a3eb 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -244,15 +244,15 @@ static void qt_print_node_count()
  * Constructs a new node
  */
 QSGNode::QSGNode()
-    : m_parent(0)
+    : m_parent(nullptr)
     , m_type(BasicNodeType)
-    , m_firstChild(0)
-    , m_lastChild(0)
-    , m_nextSibling(0)
-    , m_previousSibling(0)
+    , m_firstChild(nullptr)
+    , m_lastChild(nullptr)
+    , m_nextSibling(nullptr)
+    , m_previousSibling(nullptr)
     , m_subtreeRenderableCount(0)
     , m_nodeFlags(OwnedByParent)
-    , m_dirtyState(0)
+    , m_dirtyState(nullptr)
 {
     init();
 }
@@ -263,15 +263,15 @@ QSGNode::QSGNode()
  * \internal
  */
 QSGNode::QSGNode(NodeType type)
-    : m_parent(0)
+    : m_parent(nullptr)
     , m_type(type)
-    , m_firstChild(0)
-    , m_lastChild(0)
-    , m_nextSibling(0)
-    , m_previousSibling(0)
+    , m_firstChild(nullptr)
+    , m_lastChild(nullptr)
+    , m_nextSibling(nullptr)
+    , m_previousSibling(nullptr)
     , m_subtreeRenderableCount(type == GeometryNodeType || type == RenderNodeType ? 1 : 0)
     , m_nodeFlags(OwnedByParent)
-    , m_dirtyState(0)
+    , m_dirtyState(nullptr)
 {
     init();
 }
@@ -282,15 +282,15 @@ QSGNode::QSGNode(NodeType type)
  * \internal
  */
 QSGNode::QSGNode(QSGNodePrivate &dd, NodeType type)
-    : m_parent(0)
+    : m_parent(nullptr)
     , m_type(type)
-    , m_firstChild(0)
-    , m_lastChild(0)
-    , m_nextSibling(0)
-    , m_previousSibling(0)
+    , m_firstChild(nullptr)
+    , m_lastChild(nullptr)
+    , m_nextSibling(nullptr)
+    , m_previousSibling(nullptr)
     , m_subtreeRenderableCount(type == GeometryNodeType || type == RenderNodeType ? 1 : 0)
     , m_nodeFlags(OwnedByParent)
-    , m_dirtyState(0)
+    , m_dirtyState(nullptr)
     , d_ptr(&dd)
 {
     init();
@@ -388,17 +388,17 @@ void QSGNode::destroy()
 {
     if (m_parent) {
         m_parent->removeChildNode(this);
-        Q_ASSERT(m_parent == 0);
+        Q_ASSERT(m_parent == nullptr);
     }
     while (m_firstChild) {
         QSGNode *child = m_firstChild;
         removeChildNode(child);
-        Q_ASSERT(child->m_parent == 0);
+        Q_ASSERT(child->m_parent == nullptr);
         if (child->flags() & OwnedByParent)
             delete child;
     }
 
-    Q_ASSERT(m_firstChild == 0 && m_lastChild == 0);
+    Q_ASSERT(m_firstChild == nullptr && m_lastChild == nullptr);
 }
 
 
@@ -557,11 +557,11 @@ void QSGNode::removeChildNode(QSGNode *node)
         next->m_previousSibling = previous;
     else
         m_lastChild = previous;
-    node->m_previousSibling = 0;
-    node->m_nextSibling = 0;
+    node->m_previousSibling = nullptr;
+    node->m_nextSibling = nullptr;
 
     node->markDirty(DirtyNodeRemoved);
-    node->m_parent = 0;
+    node->m_parent = nullptr;
 }
 
 
@@ -574,13 +574,13 @@ void QSGNode::removeAllChildNodes()
     while (m_firstChild) {
         QSGNode *node = m_firstChild;
         m_firstChild = node->m_nextSibling;
-        node->m_nextSibling = 0;
+        node->m_nextSibling = nullptr;
         if (m_firstChild)
-            m_firstChild->m_previousSibling = 0;
+            m_firstChild->m_previousSibling = nullptr;
         else
-            m_lastChild = 0;
+            m_lastChild = nullptr;
         node->markDirty(DirtyNodeRemoved);
-        node->m_parent = 0;
+        node->m_parent = nullptr;
     }
 }
 
@@ -714,9 +714,9 @@ void qsgnode_set_description(QSGNode *node, const QString &description)
  */
 QSGBasicGeometryNode::QSGBasicGeometryNode(NodeType type)
     : QSGNode(type)
-    , m_geometry(0)
-    , m_matrix(0)
-    , m_clip_list(0)
+    , m_geometry(nullptr)
+    , m_matrix(nullptr)
+    , m_clip_list(nullptr)
 {
 }
 
@@ -726,9 +726,9 @@ QSGBasicGeometryNode::QSGBasicGeometryNode(NodeType type)
  */
 QSGBasicGeometryNode::QSGBasicGeometryNode(QSGBasicGeometryNodePrivate &dd, NodeType type)
     : QSGNode(dd, type)
-    , m_geometry(0)
-    , m_matrix(0)
-    , m_clip_list(0)
+    , m_geometry(nullptr)
+    , m_matrix(nullptr)
+    , m_clip_list(nullptr)
 {
 }
 
@@ -871,8 +871,8 @@ void QSGBasicGeometryNode::setGeometry(QSGGeometry *geometry)
 QSGGeometryNode::QSGGeometryNode()
     : QSGBasicGeometryNode(GeometryNodeType)
     , m_render_order(0)
-    , m_material(0)
-    , m_opaque_material(0)
+    , m_material(nullptr)
+    , m_opaque_material(nullptr)
     , m_opacity(1)
 {
 }
@@ -884,8 +884,8 @@ QSGGeometryNode::QSGGeometryNode()
 QSGGeometryNode::QSGGeometryNode(QSGGeometryNodePrivate &dd)
     : QSGBasicGeometryNode(dd, GeometryNodeType)
     , m_render_order(0)
-    , m_material(0)
-    , m_opaque_material(0)
+    , m_material(nullptr)
+    , m_opaque_material(nullptr)
     , m_opacity(1)
 {
 }
@@ -979,7 +979,7 @@ void QSGGeometryNode::setMaterial(QSGMaterial *material)
         delete m_material;
     m_material = material;
 #ifndef QT_NO_DEBUG
-    if (m_material != 0 && m_opaque_material == m_material)
+    if (m_material != nullptr && m_opaque_material == m_material)
         qWarning("QSGGeometryNode: using same material for both opaque and translucent");
 #endif
     markDirty(DirtyMaterial);
@@ -1010,7 +1010,7 @@ void QSGGeometryNode::setOpaqueMaterial(QSGMaterial *material)
         delete m_opaque_material;
     m_opaque_material = material;
 #ifndef QT_NO_DEBUG
-    if (m_opaque_material != 0 && m_opaque_material == m_material)
+    if (m_opaque_material != nullptr && m_opaque_material == m_material)
         qWarning("QSGGeometryNode: using same material for both opaque and translucent");
 #endif
 
@@ -1274,7 +1274,7 @@ QSGRootNode::QSGRootNode()
 QSGRootNode::~QSGRootNode()
 {
     while (!m_renderers.isEmpty())
-        m_renderers.constLast()->setRootNode(0);
+        m_renderers.constLast()->setRootNode(nullptr);
     destroy(); // Must call destroy() here because markDirty() casts this to QSGRootNode.
 }
 
diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
index d6d533307e..8bc9ded594 100644
--- a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 QSGNodeUpdater::QSGNodeUpdater()
     : m_combined_matrix_stack(64)
     , m_opacity_stack(64)
-    , m_current_clip(0)
+    , m_current_clip(nullptr)
     , m_force_update(0)
 {
     m_opacity_stack.add(1);
@@ -60,7 +60,7 @@ QSGNodeUpdater::~QSGNodeUpdater()
 
 void QSGNodeUpdater::updateStates(QSGNode *n)
 {
-    m_current_clip = 0;
+    m_current_clip = nullptr;
     m_force_update = 0;
 
     Q_ASSERT(m_opacity_stack.size() == 1); // The one we added in the constructr...
@@ -82,7 +82,7 @@ void QSGNodeUpdater::updateStates(QSGNode *n)
 
 bool QSGNodeUpdater::isNodeBlocked(QSGNode *node, QSGNode *root) const
 {
-    while (node != root && node != 0) {
+    while (node != root && node != nullptr) {
         if (node->isSubtreeBlocked())
             return true;
         node = node->parent();
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index 3ae79a933f..e1ba001d2d 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -132,8 +132,8 @@ QSGRenderer::QSGRenderer(QSGRenderContext *context)
     , m_current_determinant(1)
     , m_device_pixel_ratio(1)
     , m_context(context)
-    , m_node_updater(0)
-    , m_bindable(0)
+    , m_node_updater(nullptr)
+    , m_bindable(nullptr)
     , m_changed_emitted(false)
     , m_is_rendering(false)
     , m_is_preprocessing(false)
@@ -143,7 +143,7 @@ QSGRenderer::QSGRenderer(QSGRenderContext *context)
 
 QSGRenderer::~QSGRenderer()
 {
-    setRootNode(0);
+    setRootNode(nullptr);
     delete m_node_updater;
 }
 
@@ -249,7 +249,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
 
     m_is_rendering = false;
     m_changed_emitted = false;
-    m_bindable = 0;
+    m_bindable = nullptr;
 
     qCDebug(QSG_LOG_TIME_RENDERER,
             "time in renderer: total=%dms, preprocess=%d, updates=%d, binding=%d, rendering=%d",
diff --git a/src/quick/scenegraph/coreapi/qsgrendernode.cpp b/src/quick/scenegraph/coreapi/qsgrendernode.cpp
index 5e259f2083..df3fa16a32 100644
--- a/src/quick/scenegraph/coreapi/qsgrendernode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrendernode.cpp
@@ -74,8 +74,8 @@ QSGRenderNode::~QSGRenderNode()
 }
 
 QSGRenderNodePrivate::QSGRenderNodePrivate()
-    : m_matrix(0)
-    , m_clip_list(0)
+    : m_matrix(nullptr)
+    , m_clip_list(nullptr)
     , m_opacity(1)
 {
 }
@@ -119,7 +119,7 @@ QSGRenderNodePrivate::QSGRenderNodePrivate()
   */
 QSGRenderNode::StateFlags QSGRenderNode::changedStates() const
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -267,7 +267,7 @@ void QSGRenderNode::releaseResources()
  */
 QSGRenderNode::RenderingFlags QSGRenderNode::flags() const
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h
index ba146b884f..f1d8493e85 100644
--- a/src/quick/scenegraph/qsgadaptationlayer_p.h
+++ b/src/quick/scenegraph/qsgadaptationlayer_p.h
@@ -373,7 +373,7 @@ public:
         HighQualitySubPixelAntialiasing
     };
 
-    QSGGlyphNode() : m_ownerElement(0) {}
+    QSGGlyphNode() : m_ownerElement(nullptr) {}
 
     virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) = 0;
     virtual void setColor(const QColor &color) = 0;
@@ -484,7 +484,7 @@ protected:
         QPainterPath path;
         quint32 ref;
 
-        GlyphData() : texture(0), ref(0) { }
+        GlyphData() : texture(nullptr), ref(0) { }
     };
 
     virtual void requestGlyphs(const QSet<glyph_t> &glyphs) = 0;
diff --git a/src/quick/scenegraph/qsgbasicglyphnode.cpp b/src/quick/scenegraph/qsgbasicglyphnode.cpp
index 38f650a82c..4559b7951c 100644
--- a/src/quick/scenegraph/qsgbasicglyphnode.cpp
+++ b/src/quick/scenegraph/qsgbasicglyphnode.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 
 QSGBasicGlyphNode::QSGBasicGlyphNode()
     : m_style(QQuickText::Normal)
-    , m_material(0)
+    , m_material(nullptr)
     , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0)
 {
     m_geometry.setDrawingMode(QSGGeometry::DrawTriangles);
@@ -59,7 +59,7 @@ QSGBasicGlyphNode::~QSGBasicGlyphNode()
 void QSGBasicGlyphNode::setColor(const QColor &color)
 {
     m_color = color;
-    if (m_material != 0) {
+    if (m_material != nullptr) {
         setMaterialColor(color);
         markDirty(DirtyMaterial);
     }
@@ -67,7 +67,7 @@ void QSGBasicGlyphNode::setColor(const QColor &color)
 
 void QSGBasicGlyphNode::setGlyphs(const QPointF &position, const QGlyphRun &glyphs)
 {
-    if (m_material != 0)
+    if (m_material != nullptr)
         delete m_material;
 
     m_position = position;
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index a6819b338d..d9ed25c099 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -372,7 +372,7 @@ void QSGRenderContext::registerFontengineForCleanup(QFontEngine *engine)
 QSGTexture *QSGRenderContext::textureForFactory(QQuickTextureFactory *factory, QQuickWindow *window)
 {
     if (!factory)
-        return 0;
+        return nullptr;
 
     m_mutex.lock();
     QSGTexture *texture = m_textures.value(factory);
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index da0adcd5d7..00c23be60c 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -110,7 +110,7 @@ public:
         MsaaAntialiasing
     };
 
-    explicit QSGContext(QObject *parent = 0);
+    explicit QSGContext(QObject *parent = nullptr);
     virtual ~QSGContext();
 
     virtual void renderContextInitialized(QSGRenderContext *renderContext);
diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp
index 634a492aa3..a697c315a3 100644
--- a/src/quick/scenegraph/qsgcontextplugin.cpp
+++ b/src/quick/scenegraph/qsgcontextplugin.cpp
@@ -87,7 +87,7 @@ struct QSGAdaptationBackendData
 QSGAdaptationBackendData::QSGAdaptationBackendData()
     : tried(false)
     , factory(nullptr)
-    , flags(0)
+    , flags(nullptr)
 {
     // Fill in the table with the built-in adaptations.
     builtIns.append(new QSGSoftwareAdaptation);
@@ -209,7 +209,7 @@ QQuickTextureFactory *QSGContext::createTextureFactoryFromImage(const QImage &im
     QSGAdaptationBackendData *backendData = contextFactory();
     if (backendData->factory)
         return backendData->factory->createTextureFactoryFromImage(image);
-    return 0;
+    return nullptr;
 }
 
 
@@ -223,7 +223,7 @@ QSGRenderLoop *QSGContext::createWindowManager()
     QSGAdaptationBackendData *backendData = contextFactory();
     if (backendData->factory)
         return backendData->factory->createWindowManager();
-    return 0;
+    return nullptr;
 }
 
 void QSGContext::setBackend(const QString &backend)
diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h
index 02d4b79b76..d37d4df270 100644
--- a/src/quick/scenegraph/qsgcontextplugin_p.h
+++ b/src/quick/scenegraph/qsgcontextplugin_p.h
@@ -87,13 +87,13 @@ class Q_QUICK_PRIVATE_EXPORT QSGContextPlugin : public QObject, public QSGContex
     Q_OBJECT
     Q_INTERFACES(QSGContextFactoryInterface:QFactoryInterface)
 public:
-    explicit QSGContextPlugin(QObject *parent = 0);
+    explicit QSGContextPlugin(QObject *parent = nullptr);
     virtual ~QSGContextPlugin();
 
     QStringList keys() const override = 0;
 
-    QQuickTextureFactory *createTextureFactoryFromImage(const QImage &) override { return 0; }
-    QSGRenderLoop *createWindowManager() override { return 0; }
+    QQuickTextureFactory *createTextureFactoryFromImage(const QImage &) override { return nullptr; }
+    QSGRenderLoop *createWindowManager() override { return nullptr; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/qsgdefaultcontext_p.h b/src/quick/scenegraph/qsgdefaultcontext_p.h
index b2964bf403..6dfd197cf6 100644
--- a/src/quick/scenegraph/qsgdefaultcontext_p.h
+++ b/src/quick/scenegraph/qsgdefaultcontext_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 class Q_QUICK_PRIVATE_EXPORT QSGDefaultContext : public QSGContext, public QSGRendererInterface
 {
 public:
-    QSGDefaultContext(QObject *parent = 0);
+    QSGDefaultContext(QObject *parent = nullptr);
     ~QSGDefaultContext();
 
     void renderContextInitialized(QSGRenderContext *renderContext) override;
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 7789ef8fb1..ef189ba461 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -63,12 +63,12 @@ QSGDefaultDistanceFieldGlyphCache::QSGDefaultDistanceFieldGlyphCache(QOpenGLCont
     : QSGDistanceFieldGlyphCache(c, font)
     , m_maxTextureSize(0)
     , m_maxTextureCount(3)
-    , m_blitProgram(0)
+    , m_blitProgram(nullptr)
     , m_blitBuffer(QOpenGLBuffer::VertexBuffer)
-    , m_fboGuard(0)
+    , m_fboGuard(nullptr)
     , m_funcs(c->functions())
 #if !defined(QT_OPENGL_ES_2)
-    , m_coreFuncs(0)
+    , m_coreFuncs(nullptr)
 #endif
 {
     if (Q_LIKELY(m_blitBuffer.create())) {
@@ -89,7 +89,7 @@ QSGDefaultDistanceFieldGlyphCache::~QSGDefaultDistanceFieldGlyphCache()
     for (int i = 0; i < m_textures.count(); ++i)
         m_funcs->glDeleteTextures(1, &m_textures[i].texture);
 
-    if (m_fboGuard != 0)
+    if (m_fboGuard != nullptr)
         m_fboGuard->free();
 
     delete m_blitProgram;
@@ -400,7 +400,7 @@ void QSGDefaultDistanceFieldGlyphCache::resizeTexture(TextureInfo *texInfo, int
         m_funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 #endif
     m_funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,
-                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+                          GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
     m_funcs->glBindTexture(GL_TEXTURE_2D, 0);
     m_funcs->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                                     GL_TEXTURE_2D, tmp_texture, 0);
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 0169f097bc..dc473a6640 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -107,7 +107,7 @@ protected:
 
 char const *const *QSGTextMaskShader::attributeNames() const
 {
-    static char const *const attr[] = { "vCoord", "tCoord", 0 };
+    static char const *const attr[] = { "vCoord", "tCoord", nullptr };
     return attr;
 }
 
@@ -141,13 +141,13 @@ void QSGTextMaskShader::updateState(const RenderState &state, QSGMaterial *newEf
 {
     QSGTextMaskMaterial *material = static_cast<QSGTextMaskMaterial *>(newEffect);
     QSGTextMaskMaterial *oldMaterial = static_cast<QSGTextMaskMaterial *>(oldEffect);
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
     bool updated = material->ensureUpToDate();
     Q_ASSERT(material->texture());
 
-    Q_ASSERT(oldMaterial == 0 || oldMaterial->texture());
+    Q_ASSERT(oldMaterial == nullptr || oldMaterial->texture());
     if (updated
-            || oldMaterial == 0
+            || oldMaterial == nullptr
             || oldMaterial->texture()->textureId() != material->texture()->textureId()) {
         program()->setUniformValue(m_textureScale_id, QVector2D(1.0 / material->cacheTextureWidth(),
                                                                1.0 / material->cacheTextureHeight()));
@@ -190,7 +190,7 @@ void QSG8BitTextMaskShader::updateState(const RenderState &state, QSGMaterial *n
     QSGTextMaskMaterial *material = static_cast<QSGTextMaskMaterial *>(newEffect);
     QSGTextMaskMaterial *oldMaterial = static_cast<QSGTextMaskMaterial *>(oldEffect);
 
-    if (oldMaterial == 0 || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
+    if (oldMaterial == nullptr || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
         QVector4D color = qsg_premultiply(material->color(), state.opacity());
         program()->setUniformValue(m_color_id, color);
     }
@@ -282,7 +282,7 @@ void QSG24BitTextMaskShader::updateState(const RenderState &state, QSGMaterial *
     QSGTextMaskMaterial *material = static_cast<QSGTextMaskMaterial *>(newEffect);
     QSGTextMaskMaterial *oldMaterial = static_cast<QSGTextMaskMaterial *>(oldEffect);
 
-    if (oldMaterial == 0 || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
+    if (oldMaterial == nullptr || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
         QVector4D color = material->color();
         if (useSRGB())
             color = qt_sRGB_to_linear_RGB(color);
@@ -346,20 +346,20 @@ void QSGStyledTextShader::updateState(const RenderState &state,
                                       QSGMaterial *newEffect,
                                       QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
 
     QSGStyledTextMaterial *material = static_cast<QSGStyledTextMaterial *>(newEffect);
     QSGStyledTextMaterial *oldMaterial = static_cast<QSGStyledTextMaterial *>(oldEffect);
 
-    if (oldMaterial == 0 || oldMaterial->styleShift() != material->styleShift())
+    if (oldMaterial == nullptr || oldMaterial->styleShift() != material->styleShift())
         program()->setUniformValue(m_shift_id, material->styleShift());
 
-    if (oldMaterial == 0 || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
+    if (oldMaterial == nullptr || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
         QVector4D color = qsg_premultiply(material->color(), state.opacity());
         program()->setUniformValue(m_color_id, color);
     }
 
-    if (oldMaterial == 0 || material->styleColor() != oldMaterial->styleColor() || state.isOpacityDirty()) {
+    if (oldMaterial == nullptr || material->styleColor() != oldMaterial->styleColor() || state.isOpacityDirty()) {
         QVector4D styleColor = qsg_premultiply(material->styleColor(), state.opacity());
         program()->setUniformValue(m_styleColor_id, styleColor);
     }
@@ -367,9 +367,9 @@ void QSGStyledTextShader::updateState(const RenderState &state,
     bool updated = material->ensureUpToDate();
     Q_ASSERT(material->texture());
 
-    Q_ASSERT(oldMaterial == 0 || oldMaterial->texture());
+    Q_ASSERT(oldMaterial == nullptr || oldMaterial->texture());
     if (updated
-            || oldMaterial == 0
+            || oldMaterial == nullptr
             || oldMaterial->texture()->textureId() != material->texture()->textureId()) {
         program()->setUniformValue(m_textureScale_id, QVector2D(1.0 / material->cacheTextureWidth(),
                                                                 1.0 / material->cacheTextureHeight()));
@@ -400,8 +400,8 @@ public:
 };
 
 QSGTextMaskMaterial::QSGTextMaskMaterial(const QRawFont &font, QFontEngine::GlyphFormat glyphFormat)
-    : m_texture(0)
-    , m_glyphCache(0)
+    : m_texture(nullptr)
+    , m_glyphCache(nullptr)
     , m_font(font)
 {
     init(glyphFormat);
@@ -419,7 +419,7 @@ void QSGTextMaskMaterial::init(QFontEngine::GlyphFormat glyphFormat)
     setFlag(Blending, true);
 
     QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-    Q_ASSERT(ctx != 0);
+    Q_ASSERT(ctx != nullptr);
 
     // The following piece of code will read/write to the font engine's caches,
     // potentially from different threads. However, this is safe because this
diff --git a/src/quick/scenegraph/qsgdefaultinternalimagenode.cpp b/src/quick/scenegraph/qsgdefaultinternalimagenode.cpp
index a5a6da06a7..7e6d6d0d07 100644
--- a/src/quick/scenegraph/qsgdefaultinternalimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultinternalimagenode.cpp
@@ -91,7 +91,7 @@ SmoothTextureMaterialShader::SmoothTextureMaterialShader()
 
 void SmoothTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    if (oldEffect == 0) {
+    if (oldEffect == nullptr) {
         // The viewport is constant, so set the pixel size uniform only once.
         QRect r = state.viewportRect();
         program()->setUniformValue(m_pixelSizeLoc, 2.0f / r.width(), 2.0f / r.height());
@@ -106,7 +106,7 @@ char const *const *SmoothTextureMaterialShader::attributeNames() const
         "multiTexCoord",
         "vertexOffset",
         "texCoordOffset",
-        0
+        nullptr
     };
     return attributes;
 }
@@ -171,7 +171,7 @@ void QSGDefaultInternalImageNode::updateMaterialAntialiasing()
 {
     if (m_antialiasing) {
         setMaterial(&m_smoothMaterial);
-        setOpaqueMaterial(0);
+        setOpaqueMaterial(nullptr);
     } else {
         setMaterial(&m_materialO);
         setOpaqueMaterial(&m_material);
diff --git a/src/quick/scenegraph/qsgdefaultinternalrectanglenode.cpp b/src/quick/scenegraph/qsgdefaultinternalrectanglenode.cpp
index e52dcaad52..ef8a13931e 100644
--- a/src/quick/scenegraph/qsgdefaultinternalrectanglenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultinternalrectanglenode.cpp
@@ -81,7 +81,7 @@ void SmoothColorMaterialShader::updateState(const RenderState &state, QSGMateria
     if (state.isMatrixDirty())
         program()->setUniformValue(m_matrixLoc, state.combinedMatrix());
 
-    if (oldEffect == 0) {
+    if (oldEffect == nullptr) {
         // The viewport is constant, so set the pixel size uniform only once.
         QRect r = state.viewportRect();
         program()->setUniformValue(m_pixelSizeLoc, 2.0f / r.width(), 2.0f / r.height());
@@ -94,7 +94,7 @@ char const *const *SmoothColorMaterialShader::attributeNames() const
         "vertex",
         "vertexColor",
         "vertexOffset",
-        0
+        nullptr
     };
     return attributes;
 }
diff --git a/src/quick/scenegraph/qsgdefaultlayer.cpp b/src/quick/scenegraph/qsgdefaultlayer.cpp
index cd9c4a9a90..b2b123912f 100644
--- a/src/quick/scenegraph/qsgdefaultlayer.cpp
+++ b/src/quick/scenegraph/qsgdefaultlayer.cpp
@@ -90,15 +90,15 @@ namespace
 
 QSGDefaultLayer::QSGDefaultLayer(QSGRenderContext *context)
     : QSGLayer()
-    , m_item(0)
+    , m_item(nullptr)
     , m_device_pixel_ratio(1)
     , m_format(GL_RGBA)
-    , m_renderer(0)
-    , m_fbo(0)
-    , m_secondaryFbo(0)
+    , m_renderer(nullptr)
+    , m_fbo(nullptr)
+    , m_secondaryFbo(nullptr)
     , m_transparentTexture(0)
 #ifdef QSG_DEBUG_FBO_OVERLAY
-    , m_debugOverlay(0)
+    , m_debugOverlay(nullptr)
 #endif
     , m_samples(0)
     , m_mipmap(false)
@@ -122,13 +122,13 @@ QSGDefaultLayer::~QSGDefaultLayer()
 void QSGDefaultLayer::invalidated()
 {
     delete m_renderer;
-    m_renderer = 0;
+    m_renderer = nullptr;
     delete m_fbo;
     delete m_secondaryFbo;
-    m_fbo = m_secondaryFbo = 0;
+    m_fbo = m_secondaryFbo = nullptr;
 #ifdef QSG_DEBUG_FBO_OVERLAY
     delete m_debugOverlay;
-    m_debugOverlay = 0;
+    m_debugOverlay = nullptr;
 #endif
     if (m_transparentTexture) {
         QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_transparentTexture);
@@ -204,7 +204,7 @@ void QSGDefaultLayer::setItem(QSGNode *item)
     if (m_live && !m_item) {
         delete m_fbo;
         delete m_secondaryFbo;
-        m_fbo = m_secondaryFbo = 0;
+        m_fbo = m_secondaryFbo = nullptr;
         m_depthStencilBuffer.clear();
     }
 
@@ -228,7 +228,7 @@ void QSGDefaultLayer::setSize(const QSize &size)
     if (m_live && m_size.isNull()) {
         delete m_fbo;
         delete m_secondaryFbo;
-        m_fbo = m_secondaryFbo = 0;
+        m_fbo = m_secondaryFbo = nullptr;
         m_depthStencilBuffer.clear();
     }
 
@@ -252,7 +252,7 @@ void QSGDefaultLayer::setLive(bool live)
     if (m_live && (!m_item || m_size.isNull())) {
         delete m_fbo;
         delete m_secondaryFbo;
-        m_fbo = m_secondaryFbo = 0;
+        m_fbo = m_secondaryFbo = nullptr;
         m_depthStencilBuffer.clear();
     }
 
@@ -295,7 +295,7 @@ void QSGDefaultLayer::grab()
     if (!m_item || m_size.isNull()) {
         delete m_fbo;
         delete m_secondaryFbo;
-        m_fbo = m_secondaryFbo = 0;
+        m_fbo = m_secondaryFbo = nullptr;
         m_depthStencilBuffer.clear();
         m_dirtyTexture = false;
         return;
@@ -362,7 +362,7 @@ void QSGDefaultLayer::grab()
                 delete m_fbo;
                 delete m_secondaryFbo;
                 m_fbo = new QOpenGLFramebufferObject(m_size, format);
-                m_secondaryFbo = 0;
+                m_secondaryFbo = nullptr;
                 funcs->glBindTexture(GL_TEXTURE_2D, m_fbo->texture());
                 updateBindOptions(true);
                 m_depthStencilBuffer = m_context->depthStencilBufferForFbo(m_fbo);
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index 12357f12c7..7882496062 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -157,14 +157,14 @@ void QSGDefaultRenderContext::invalidate()
     m_fontEnginesToClean.clear();
 
     delete m_depthStencilManager;
-    m_depthStencilManager = 0;
+    m_depthStencilManager = nullptr;
 
     qDeleteAll(m_glyphCaches);
     m_glyphCaches.clear();
 
     if (m_gl->property(QSG_RENDERCONTEXT_PROPERTY) == QVariant::fromValue(this))
         m_gl->setProperty(QSG_RENDERCONTEXT_PROPERTY, QVariant());
-    m_gl = 0;
+    m_gl = nullptr;
 
     if (m_sg)
         m_sg->renderContextInvalidated(this);
@@ -211,7 +211,7 @@ QSharedPointer<QSGDepthStencilBuffer> QSGDefaultRenderContext::depthStencilBuffe
 QSGDepthStencilBufferManager *QSGDefaultRenderContext::depthStencilBufferManager()
 {
     if (!m_gl)
-        return 0;
+        return nullptr;
     if (!m_depthStencilManager)
         m_depthStencilManager = new QSGDepthStencilBufferManager(m_gl);
     return m_depthStencilManager;
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
index 68329256f1..eb62586a94 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h
+++ b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
@@ -86,7 +86,7 @@ public:
     QSGRenderer *createRenderer() override;
     QSGTexture *compressedTextureForFactory(const QSGCompressedTextureFactory *factory) const override;
 
-    virtual void compileShader(QSGMaterialShader *shader, QSGMaterial *material, const char *vertexCode = 0, const char *fragmentCode = 0);
+    virtual void compileShader(QSGMaterialShader *shader, QSGMaterial *material, const char *vertexCode = nullptr, const char *fragmentCode = nullptr);
     virtual void initializeShader(QSGMaterialShader *shader);
 
     void setAttachToGraphicsContext(bool attach) override;
diff --git a/src/quick/scenegraph/qsgdefaultspritenode.cpp b/src/quick/scenegraph/qsgdefaultspritenode.cpp
index 7fe6048d59..c9a9625f2b 100644
--- a/src/quick/scenegraph/qsgdefaultspritenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultspritenode.cpp
@@ -82,7 +82,7 @@ public:
 };
 
 QQuickSpriteMaterial::QQuickSpriteMaterial()
-    : texture(0)
+    : texture(nullptr)
     , animT(0.0f)
     , animX1(0.0f)
     , animY1(0.0f)
@@ -133,7 +133,7 @@ public:
         static const char *attr[] = {
            "vPos",
            "vTex",
-            0
+            nullptr
         };
         return attr;
     }
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
index 32eda2d142..ae6336718e 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
@@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE
 QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode(QSGRenderContext *context)
     : m_glyphNodeType(RootGlyphNode)
     , m_context(context)
-    , m_material(0)
-    , m_glyph_cache(0)
+    , m_material(nullptr)
+    , m_glyph_cache(nullptr)
     , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0)
     , m_style(QQuickText::Normal)
     , m_antialiasingMode(GrayAntialiasing)
-    , m_texture(0)
+    , m_texture(nullptr)
     , m_dirtyGeometry(false)
     , m_dirtyMaterial(false)
 {
@@ -80,7 +80,7 @@ QSGDistanceFieldGlyphNode::~QSGDistanceFieldGlyphNode()
 void QSGDistanceFieldGlyphNode::setColor(const QColor &color)
 {
     m_color = color;
-    if (m_material != 0) {
+    if (m_material != nullptr) {
         m_material->setColor(color);
         markDirty(DirtyMaterial);
     } else {
@@ -113,7 +113,7 @@ void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphR
         return;
 
     if (m_glyph_cache != oldCache) {
-        Q_ASSERT(ownerElement() != 0);
+        Q_ASSERT(ownerElement() != nullptr);
         if (oldCache) {
             oldCache->unregisterGlyphNode(this);
             oldCache->unregisterOwnerElement(ownerElement());
@@ -181,7 +181,7 @@ void QSGDistanceFieldGlyphNode::updateGeometry()
     // Remove previously created sub glyph nodes
     // We assume all the children are sub glyph nodes
     QSGNode *subnode = firstChild();
-    QSGNode *nextNode = 0;
+    QSGNode *nextNode = nullptr;
     while (subnode) {
         nextNode = subnode->nextSibling();
         delete subnode;
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index 03c5738e56..dd2d787495 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -77,7 +77,7 @@ protected:
 };
 
 char const *const *QSGDistanceFieldTextMaterialShader::attributeNames() const {
-    static char const *const attr[] = { "vCoord", "tCoord", 0 };
+    static char const *const attr[] = { "vCoord", "tCoord", nullptr };
     return attr;
 }
 
@@ -166,13 +166,13 @@ void QSGDistanceFieldTextMaterialShader::initialize()
 
 void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
     QSGDistanceFieldTextMaterial *material = static_cast<QSGDistanceFieldTextMaterial *>(newEffect);
     QSGDistanceFieldTextMaterial *oldMaterial = static_cast<QSGDistanceFieldTextMaterial *>(oldEffect);
 
     bool updated = material->updateTextureSize();
 
-    if (oldMaterial == 0
+    if (oldMaterial == nullptr
            || material->color() != oldMaterial->color()
            || state.isOpacityDirty()) {
         QVector4D color = material->color();
@@ -181,7 +181,7 @@ void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, Q
     }
 
     bool updateRange = false;
-    if (oldMaterial == 0
+    if (oldMaterial == nullptr
             || material->fontScale() != oldMaterial->fontScale()) {
         m_fontScale = material->fontScale();
         updateRange = true;
@@ -198,7 +198,7 @@ void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, Q
     Q_ASSERT(material->glyphCache());
 
     if (updated
-            || oldMaterial == 0
+            || oldMaterial == nullptr
             || oldMaterial->texture()->textureId != material->texture()->textureId) {
         updateTextureScale(QVector2D(1.0 / material->textureSize().width(),
                                      1.0 / material->textureSize().height()));
@@ -218,8 +218,8 @@ void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, Q
 }
 
 QSGDistanceFieldTextMaterial::QSGDistanceFieldTextMaterial()
-    : m_glyph_cache(0)
-    , m_texture(0)
+    : m_glyph_cache(nullptr)
+    , m_texture(nullptr)
     , m_fontScale(1.0)
 {
    setFlag(Blending | RequiresDeterminant, true);
@@ -310,7 +310,7 @@ void DistanceFieldStyledTextMaterialShader::updateState(const RenderState &state
     QSGDistanceFieldStyledTextMaterial *material = static_cast<QSGDistanceFieldStyledTextMaterial *>(newEffect);
     QSGDistanceFieldStyledTextMaterial *oldMaterial = static_cast<QSGDistanceFieldStyledTextMaterial *>(oldEffect);
 
-    if (oldMaterial == 0
+    if (oldMaterial == nullptr
            || material->styleColor() != oldMaterial->styleColor()
            || (state.isOpacityDirty())) {
         QVector4D color = material->styleColor();
@@ -398,7 +398,7 @@ void DistanceFieldOutlineTextMaterialShader::updateState(const RenderState &stat
     QSGDistanceFieldOutlineTextMaterial *material = static_cast<QSGDistanceFieldOutlineTextMaterial *>(newEffect);
     QSGDistanceFieldOutlineTextMaterial *oldMaterial = static_cast<QSGDistanceFieldOutlineTextMaterial *>(oldEffect);
 
-    if (oldMaterial == 0
+    if (oldMaterial == nullptr
             || material->fontScale() != oldMaterial->fontScale()
             || state.isMatrixDirty())
         updateOutlineAlphaRange(material->glyphCache()->distanceFieldRadius());
@@ -462,7 +462,7 @@ void DistanceFieldShiftedStyleTextMaterialShader::updateState(const RenderState
     QSGDistanceFieldShiftedStyleTextMaterial *material = static_cast<QSGDistanceFieldShiftedStyleTextMaterial *>(newEffect);
     QSGDistanceFieldShiftedStyleTextMaterial *oldMaterial = static_cast<QSGDistanceFieldShiftedStyleTextMaterial *>(oldEffect);
 
-    if (oldMaterial == 0
+    if (oldMaterial == nullptr
             || oldMaterial->fontScale() != material->fontScale()
             || oldMaterial->shift() != material->shift()
             || oldMaterial->textureSize() != material->textureSize()) {
@@ -550,19 +550,19 @@ void QSGHiQSubPixelDistanceFieldTextMaterialShader::deactivate()
 
 void QSGHiQSubPixelDistanceFieldTextMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
     QSGDistanceFieldTextMaterial *material = static_cast<QSGDistanceFieldTextMaterial *>(newEffect);
     QSGDistanceFieldTextMaterial *oldMaterial = static_cast<QSGDistanceFieldTextMaterial *>(oldEffect);
 
-    if (oldMaterial == 0 || material->color() != oldMaterial->color()) {
+    if (oldMaterial == nullptr || material->color() != oldMaterial->color()) {
         QVector4D c = material->color();
         state.context()->functions()->glBlendColor(c.x(), c.y(), c.z(), 1.0f);
     }
 
-    if (oldMaterial == 0 || material->fontScale() != oldMaterial->fontScale())
+    if (oldMaterial == nullptr || material->fontScale() != oldMaterial->fontScale())
         program()->setUniformValue(m_fontScale_id, GLfloat(material->fontScale()));
 
-    if (oldMaterial == 0 || state.isMatrixDirty()) {
+    if (oldMaterial == nullptr || state.isMatrixDirty()) {
         int viewportWidth = state.viewportRect().width();
         QMatrix4x4 mat = state.combinedMatrix().inverted();
         program()->setUniformValue(m_vecDelta_id, mat.column(0) * (qreal(2) / viewportWidth));
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index e74ba83e7f..60f3538662 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -88,7 +88,7 @@ extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_
 DEFINE_BOOL_CONFIG_OPTION(qmlNoThreadedRenderer, QML_BAD_GUI_RENDER_LOOP);
 DEFINE_BOOL_CONFIG_OPTION(qmlForceThreadedRenderer, QML_FORCE_THREADED_RENDERER); // Might trigger graphics driver threading bugs, use at own risk
 #endif
-QSGRenderLoop *QSGRenderLoop::s_instance = 0;
+QSGRenderLoop *QSGRenderLoop::s_instance = nullptr;
 
 QSGRenderLoop::~QSGRenderLoop()
 {
@@ -107,11 +107,11 @@ void QSGRenderLoop::cleanup()
         QQuickWindowPrivate *wd = QQuickWindowPrivate::get(w);
         if (wd->windowManager == s_instance) {
            s_instance->windowDestroyed(w);
-           wd->windowManager = 0;
+           wd->windowManager = nullptr;
         }
     }
     delete s_instance;
-    s_instance = 0;
+    s_instance = nullptr;
 }
 
 /*!
@@ -155,7 +155,7 @@ public:
 
     void releaseResources(QQuickWindow *) override;
 
-    QAnimationDriver *animationDriver() const override { return 0; }
+    QAnimationDriver *animationDriver() const override { return nullptr; }
 
     QSGContext *sceneGraphContext() const override;
     QSGRenderContext *createRenderContext(QSGContext *) const override { return rc; }
@@ -275,7 +275,7 @@ void QSGRenderLoop::handleContextCreationFailure(QQuickWindow *window,
 }
 #if QT_CONFIG(opengl)
 QSGGuiThreadRenderLoop::QSGGuiThreadRenderLoop()
-    : gl(0)
+    : gl(nullptr)
 {
     if (qsg_useConsistentTiming()) {
         QUnifiedTimer::instance(true)->setConsistentTiming(true);
@@ -337,7 +337,7 @@ void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
     if (m_windows.size() == 0) {
         rc->invalidate();
         delete gl;
-        gl = 0;
+        gl = nullptr;
     } else if (gl && window == gl->surface() && current) {
         gl->doneCurrent();
     }
@@ -364,7 +364,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         if (!gl->create()) {
             const bool isEs = gl->isOpenGLES();
             delete gl;
-            gl = 0;
+            gl = nullptr;
             handleContextCreationFailure(window, isEs);
         } else {
             cd->fireOpenGLContextCreated(gl);
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index c2f0cc4716..8262708320 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -167,7 +167,7 @@ template <typename T> T *windowFor(const QList<T> &list, QQuickWindow *window)
         if (t.window == window)
             return const_cast<T *>(&t);
     }
-    return 0;
+    return nullptr;
 }
 
 
@@ -270,13 +270,13 @@ class QSGRenderThread : public QThread
 public:
     QSGRenderThread(QSGThreadedRenderLoop *w, QSGRenderContext *renderContext)
         : wm(w)
-        , gl(0)
-        , animatorDriver(0)
+        , gl(nullptr)
+        , animatorDriver(nullptr)
         , pendingUpdate(0)
         , sleeping(false)
         , syncResultedInChanges(false)
         , active(false)
-        , window(0)
+        , window(nullptr)
         , stopEventProcessing(false)
     {
         sgrc = static_cast<QSGDefaultRenderContext *>(renderContext);
@@ -366,7 +366,7 @@ bool QSGRenderThread::event(QEvent *e)
         if (window) {
             QQuickWindowPrivate::get(window)->fireAboutToStop();
             qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "- window removed");
-            window = 0;
+            window = nullptr;
         }
         waitCondition.wakeOne();
         mutex.unlock();
@@ -456,7 +456,7 @@ bool QSGRenderThread::event(QEvent *e)
             gl->makeCurrent(window);
             ce->job->run();
             delete ce->job;
-            ce->job = 0;
+            ce->job = nullptr;
             qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "- job done");
         }
         return true;
@@ -514,7 +514,7 @@ void QSGRenderThread::invalidateOpenGL(QQuickWindow *window, bool inDestructor,
 
     sgrc->invalidate();
     QCoreApplication::processEvents();
-    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+    QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
     if (inDestructor)
         delete dd->animationController;
     if (current)
@@ -523,7 +523,7 @@ void QSGRenderThread::invalidateOpenGL(QQuickWindow *window, bool inDestructor,
 
     if (wipeGL) {
         delete gl;
-        gl = 0;
+        gl = nullptr;
         qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "- invalidated OpenGL");
     } else {
         qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "- persistent GL, avoiding cleanup");
@@ -554,7 +554,7 @@ void QSGRenderThread::sync(bool inExpose)
     }
     if (current) {
         QQuickWindowPrivate *d = QQuickWindowPrivate::get(window);
-        bool hadRenderer = d->renderer != 0;
+        bool hadRenderer = d->renderer != nullptr;
         // If the scene graph was touched since the last sync() make sure it sends the
         // changed signal.
         if (d->renderer)
@@ -570,7 +570,7 @@ void QSGRenderThread::sync(bool inExpose)
         // Process deferred deletes now, directly after the sync as
         // deleteLater on the GUI must now also have resulted in SG changes
         // and the delete is a safe operation.
-        QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+        QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
     } else {
         qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "- window has bad size, sync aborted");
     }
@@ -716,7 +716,7 @@ void QSGRenderThread::processEventsAndWaitForMore()
 void QSGRenderThread::run()
 {
     qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "run()");
-    animatorDriver = sgrc->sceneGraphContext()->createAnimationDriver(0);
+    animatorDriver = sgrc->sceneGraphContext()->createAnimationDriver(nullptr);
     animatorDriver->install();
     if (QQmlDebugConnector::service<QQmlProfilerService>())
         QQuickProfiler::registerAnimationCallback();
@@ -745,7 +745,7 @@ void QSGRenderThread::run()
     qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "run() completed");
 
     delete animatorDriver;
-    animatorDriver = 0;
+    animatorDriver = nullptr;
 
     sgrc->moveToThread(wm->thread());
     moveToThread(wm->thread());
@@ -826,7 +826,7 @@ void QSGThreadedRenderLoop::animationStopped()
 void QSGThreadedRenderLoop::startOrStopAnimationTimer()
 {
     int exposedWindows = 0;
-    const Window *theOne = 0;
+    const Window *theOne = nullptr;
     for (int i=0; i<m_windows.size(); ++i) {
         const Window &w = m_windows.at(i);
         if (w.window->isVisible() && w.window->isExposed()) {
@@ -973,7 +973,7 @@ void QSGThreadedRenderLoop::handleExposure(QQuickWindow *window)
             if (!w->thread->gl->create()) {
                 const bool isEs = w->thread->gl->isOpenGLES();
                 delete w->thread->gl;
-                w->thread->gl = 0;
+                w->thread->gl = nullptr;
                 handleContextCreationFailure(w->window, isEs);
                 return;
             }
@@ -1123,7 +1123,7 @@ void QSGThreadedRenderLoop::releaseResources(Window *w, bool inDestructor)
         // and the OpenGL resources.
         // QOffscreenSurface must be created on the GUI thread, so we
         // create it here and pass it on to QSGRenderThread::invalidateGL()
-        QOffscreenSurface *fallback = 0;
+        QOffscreenSurface *fallback = nullptr;
         if (!window->handle()) {
             qCDebug(QSG_LOG_RENDERLOOP, "- using fallback surface");
             fallback = new QOffscreenSurface();
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
index 8072359e11..3b2737b8e1 100644
--- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp
+++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -78,7 +78,7 @@ static QElapsedTimer qsg_render_timer;
 
 
 QSGWindowsRenderLoop::QSGWindowsRenderLoop()
-    : m_gl(0)
+    : m_gl(nullptr)
     , m_sg(QSGContext::createDefaultContext())
     , m_updateTimer(0)
     , m_animationTimer(0)
@@ -117,7 +117,7 @@ QSGWindowsRenderLoop::WindowData *QSGWindowsRenderLoop::windowData(QQuickWindow
         if (wd.window == window)
             return &wd;
     }
-    return 0;
+    return nullptr;
 }
 
 void QSGWindowsRenderLoop::maybePostUpdateTimer()
@@ -158,7 +158,7 @@ void QSGWindowsRenderLoop::stopped()
 void QSGWindowsRenderLoop::show(QQuickWindow *window)
 {
     RLDEBUG("show");
-    if (windowData(window) != 0)
+    if (windowData(window) != nullptr)
         return;
 
     // This happens before the platform window is shown, but after
@@ -178,7 +178,7 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window)
         if (!created) {
             const bool isEs = m_gl->isOpenGLES();
             delete m_gl;
-            m_gl = 0;
+            m_gl = nullptr;
             handleContextCreationFailure(window, isEs);
             return;
         }
@@ -253,7 +253,7 @@ void QSGWindowsRenderLoop::windowDestroyed(QQuickWindow *window)
     if (m_windows.size() == 0) {
         d->context->invalidate();
         delete m_gl;
-        m_gl = 0;
+        m_gl = nullptr;
     } else if (m_gl && current) {
         m_gl->doneCurrent();
     }
@@ -272,7 +272,7 @@ bool QSGWindowsRenderLoop::anyoneShowing() const
 void QSGWindowsRenderLoop::exposureChanged(QQuickWindow *window)
 {
 
-    if (windowData(window) == 0)
+    if (windowData(window) == nullptr)
         return;
 
     if (window->isExposed() && window->isVisible()) {
diff --git a/src/quick/scenegraph/util/qsgareaallocator.cpp b/src/quick/scenegraph/util/qsgareaallocator.cpp
index 67a9fa285a..cd270a1d63 100644
--- a/src/quick/scenegraph/util/qsgareaallocator.cpp
+++ b/src/quick/scenegraph/util/qsgareaallocator.cpp
@@ -72,8 +72,8 @@ struct QSGAreaAllocatorNode
 
 QSGAreaAllocatorNode::QSGAreaAllocatorNode(QSGAreaAllocatorNode *parent)
     : parent(parent)
-    , left(0)
-    , right(0)
+    , left(nullptr)
+    , right(nullptr)
     , isOccupied(false)
 {
 }
@@ -86,14 +86,14 @@ QSGAreaAllocatorNode::~QSGAreaAllocatorNode()
 
 bool QSGAreaAllocatorNode::isLeaf()
 {
-    Q_ASSERT((left != 0) == (right != 0));
+    Q_ASSERT((left != nullptr) == (right != nullptr));
     return !left;
 }
 
 
 QSGAreaAllocator::QSGAreaAllocator(const QSize &size) : m_size(size)
 {
-    m_root = new QSGAreaAllocatorNode(0);
+    m_root = new QSGAreaAllocatorNode(nullptr);
 }
 
 QSGAreaAllocator::~QSGAreaAllocator()
@@ -179,13 +179,13 @@ bool QSGAreaAllocator::deallocateInNode(const QPoint &pos, QSGAreaAllocatorNode
 void QSGAreaAllocator::mergeNodeWithNeighbors(QSGAreaAllocatorNode *node)
 {
     bool done = false;
-    QSGAreaAllocatorNode *parent = 0;
-    QSGAreaAllocatorNode *current = 0;
+    QSGAreaAllocatorNode *parent = nullptr;
+    QSGAreaAllocatorNode *current = nullptr;
     QSGAreaAllocatorNode *sibling;
     while (!done) {
         Q_ASSERT(node->isLeaf());
         Q_ASSERT(!node->isOccupied);
-        if (node->parent == 0)
+        if (node->parent == nullptr)
             return; // No neighbours.
 
         SplitType splitType = SplitType(node->parent->splitType);
@@ -238,7 +238,7 @@ void QSGAreaAllocator::mergeNodeWithNeighbors(QSGAreaAllocatorNode *node)
                 }
                 sibling->parent = parent->parent;
                 *nodeRef = sibling;
-                parent->left = parent->right = 0;
+                parent->left = parent->right = nullptr;
                 delete parent;
                 delete neighbor;
                 done = false;
@@ -276,7 +276,7 @@ void QSGAreaAllocator::mergeNodeWithNeighbors(QSGAreaAllocatorNode *node)
                 }
                 sibling->parent = parent->parent;
                 *nodeRef = sibling;
-                parent->left = parent->right = 0;
+                parent->left = parent->right = nullptr;
                 delete parent;
                 delete neighbor;
                 done = false;
diff --git a/src/quick/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h
index aa40ff0a6e..8bc05a5a5b 100644
--- a/src/quick/scenegraph/util/qsgareaallocator_p.h
+++ b/src/quick/scenegraph/util/qsgareaallocator_p.h
@@ -67,7 +67,7 @@ public:
 
     QRect allocate(const QSize &size);
     bool deallocate(const QRect &rect);
-    bool isEmpty() const { return m_root == 0; }
+    bool isEmpty() const { return m_root == nullptr; }
     QSize size() const { return m_size; }
 private:
     bool allocateInNode(const QSize &size, QPoint &result, const QRect &currentRect, QSGAreaAllocatorNode *node);
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index 4ca5fba7de..7608a81ddc 100644
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -75,7 +75,7 @@ namespace QSGAtlasTexture
 {
 
 Manager::Manager()
-    : m_atlas(0)
+    : m_atlas(nullptr)
 {
     QOpenGLContext *gl = QOpenGLContext::currentContext();
     Q_ASSERT(gl);
@@ -105,7 +105,7 @@ Manager::Manager()
 
 Manager::~Manager()
 {
-    Q_ASSERT(m_atlas == 0);
+    Q_ASSERT(m_atlas == nullptr);
     Q_ASSERT(m_atlases.isEmpty());
 }
 
@@ -114,7 +114,7 @@ void Manager::invalidate()
     if (m_atlas) {
         m_atlas->invalidate();
         m_atlas->deleteLater();
-        m_atlas = 0;
+        m_atlas = nullptr;
     }
 
     QHash<unsigned int, QSGCompressedAtlasTexture::Atlas*>::iterator i = m_atlases.begin();
@@ -128,7 +128,7 @@ void Manager::invalidate()
 
 QSGTexture *Manager::create(const QImage &image, bool hasAlphaChannel)
 {
-    Texture *t = 0;
+    Texture *t = nullptr;
     if (image.width() < m_atlas_size_limit && image.height() < m_atlas_size_limit) {
         if (!m_atlas)
             m_atlas = new Atlas(m_atlas_size);
@@ -142,7 +142,7 @@ QSGTexture *Manager::create(const QImage &image, bool hasAlphaChannel)
 
 QSGTexture *Manager::create(const QSGCompressedTextureFactory *factory)
 {
-    QSGTexture *t = 0;
+    QSGTexture *t = nullptr;
     if (!qsgEnableCompressedAtlas() || !factory->m_textureData || !factory->m_textureData->isValid())
         return t;
 
@@ -348,7 +348,7 @@ Texture *Atlas::create(const QImage &image)
         m_pending_uploads << t;
         return t;
     }
-    return 0;
+    return nullptr;
 }
 
 static void swizzleBGRAToRGBA(QImage *image)
@@ -467,7 +467,7 @@ void Atlas::uploadBgra(Texture *texture)
 void Atlas::generateTexture()
 {
     QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    funcs->glTexImage2D(GL_TEXTURE_2D, 0, m_internalFormat, m_size.width(), m_size.height(), 0, m_externalFormat, GL_UNSIGNED_BYTE, 0);
+    funcs->glTexImage2D(GL_TEXTURE_2D, 0, m_internalFormat, m_size.width(), m_size.height(), 0, m_externalFormat, GL_UNSIGNED_BYTE, nullptr);
 
 #if 0
     QImage pink(m_size.width(), m_size.height(), QImage::Format_ARGB32_Premultiplied);
@@ -527,7 +527,7 @@ void TextureBase::bind()
 Texture::Texture(Atlas *atlas, const QRect &textureRect, const QImage &image)
     : TextureBase(atlas, textureRect)
     , m_image(image)
-    , m_nonatlas_texture(0)
+    , m_nonatlas_texture(nullptr)
     , m_has_alpha(image.hasAlphaChannel())
 {
     float w = atlas->size().width();
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
index 9ffd1b4b08..981ea089be 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
@@ -78,11 +78,11 @@ QSGDefaultPainterNode::QSGDefaultPainterNode(QQuickPaintedItem *item)
     , m_preferredRenderTarget(QQuickPaintedItem::Image)
     , m_actualRenderTarget(QQuickPaintedItem::Image)
     , m_item(item)
-    , m_fbo(0)
-    , m_multisampledFbo(0)
+    , m_fbo(nullptr)
+    , m_multisampledFbo(nullptr)
     , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
-    , m_texture(0)
-    , m_gl_device(0)
+    , m_texture(nullptr)
+    , m_gl_device(nullptr)
     , m_fillColor(Qt::transparent)
     , m_contentsScale(1.0)
     , m_dirtyContents(false)
@@ -260,8 +260,8 @@ void QSGDefaultPainterNode::updateRenderTarget()
         delete m_fbo;
         delete m_multisampledFbo;
         delete m_gl_device;
-        m_fbo = m_multisampledFbo = 0;
-        m_gl_device = 0;
+        m_fbo = m_multisampledFbo = nullptr;
+        m_gl_device = nullptr;
     }
 
     if (m_actualRenderTarget == QQuickPaintedItem::FramebufferObject ||
@@ -275,7 +275,7 @@ void QSGDefaultPainterNode::updateRenderTarget()
 
         delete m_fbo;
         delete m_multisampledFbo;
-        m_fbo = m_multisampledFbo = 0;
+        m_fbo = m_multisampledFbo = nullptr;
         if (m_gl_device)
             m_gl_device->setSize(m_fboSize);
 
diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
index ba0207aca8..56508af152 100644
--- a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
+++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 
 QSGDepthStencilBuffer::QSGDepthStencilBuffer(QOpenGLContext *context, const Format &format)
     : m_functions(context)
-    , m_manager(0)
+    , m_manager(nullptr)
     , m_format(format)
     , m_depthBuffer(0)
     , m_stencilBuffer(0)
@@ -160,7 +160,7 @@ QSGDepthStencilBufferManager::~QSGDepthStencilBufferManager()
     for (Hash::const_iterator it = m_buffers.constBegin(), cend = m_buffers.constEnd(); it != cend; ++it) {
         QSGDepthStencilBuffer *buffer = it.value().data();
         buffer->free();
-        buffer->m_manager = 0;
+        buffer->m_manager = nullptr;
     }
 }
 
@@ -174,7 +174,7 @@ QSharedPointer<QSGDepthStencilBuffer> QSGDepthStencilBufferManager::bufferForFor
 
 void QSGDepthStencilBufferManager::insertBuffer(const QSharedPointer<QSGDepthStencilBuffer> &buffer)
 {
-    Q_ASSERT(buffer->m_manager == 0);
+    Q_ASSERT(buffer->m_manager == nullptr);
     Q_ASSERT(!m_buffers.contains(buffer->m_format));
     buffer->m_manager = this;
     m_buffers.insert(buffer->m_format, buffer.toWeakRef());
diff --git a/src/quick/scenegraph/util/qsgengine.cpp b/src/quick/scenegraph/util/qsgengine.cpp
index dffe199224..91fa46033c 100644
--- a/src/quick/scenegraph/util/qsgengine.cpp
+++ b/src/quick/scenegraph/util/qsgengine.cpp
@@ -157,7 +157,7 @@ QSGAbstractRenderer *QSGEngine::createRenderer() const
 {
     Q_D(const QSGEngine);
     if (!d->sgRenderContext->isValid())
-        return 0;
+        return nullptr;
 
     QSGRenderer *renderer = d->sgRenderContext->createRenderer();
     renderer->setCustomRenderMode(qgetenv("QSG_VISUALIZE"));
@@ -178,7 +178,7 @@ QSGTexture *QSGEngine::createTextureFromImage(const QImage &image, CreateTexture
 {
     Q_D(const QSGEngine);
      if (!d->sgRenderContext->isValid())
-         return 0;
+         return nullptr;
     uint flags = 0;
     if (options & TextureCanUseAtlas)     flags |= QSGRenderContext::CreateTexture_Atlas;
     if (!(options & TextureIsOpaque))     flags |= QSGRenderContext::CreateTexture_Alpha;
@@ -206,7 +206,7 @@ QSGTexture *QSGEngine::createTextureFromId(uint id, const QSize &size, CreateTex
         texture->setTextureSize(size);
         return texture;
     }
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
index a0c71b5340..28f6113a60 100644
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
@@ -77,13 +77,13 @@ FlatColorMaterialShader::FlatColorMaterialShader()
 void FlatColorMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
 #if QT_CONFIG(opengl)
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
     QSGFlatColorMaterial *oldMaterial = static_cast<QSGFlatColorMaterial *>(oldEffect);
     QSGFlatColorMaterial *newMaterial = static_cast<QSGFlatColorMaterial *>(newEffect);
 
     const QColor &c = newMaterial->color();
 
-    if (oldMaterial == 0 || c != oldMaterial->color() || state.isOpacityDirty()) {
+    if (oldMaterial == nullptr || c != oldMaterial->color() || state.isOpacityDirty()) {
         float opacity = state.opacity() * c.alphaF();
         QVector4D v(c.redF() * opacity,
                     c.greenF() *  opacity,
@@ -103,7 +103,7 @@ void FlatColorMaterialShader::updateState(const RenderState &state, QSGMaterial
 
 char const *const *FlatColorMaterialShader::attributeNames() const
 {
-    static char const *const attr[] = { "vCoord", 0 };
+    static char const *const attr[] = { "vCoord", nullptr };
     return attr;
 }
 
diff --git a/src/quick/scenegraph/util/qsgshadersourcebuilder.cpp b/src/quick/scenegraph/util/qsgshadersourcebuilder.cpp
index e134a5d4d3..93fc213f2e 100644
--- a/src/quick/scenegraph/util/qsgshadersourcebuilder.cpp
+++ b/src/quick/scenegraph/util/qsgshadersourcebuilder.cpp
@@ -262,8 +262,8 @@ void QSGShaderSourceBuilder::addDefinition(const QByteArray &definition)
     tok.initialize(input);
 
     // First find #version, #extension's and "void main() { ... "
-    const char *versionPos = 0;
-    const char *extensionPos = 0;
+    const char *versionPos = nullptr;
+    const char *extensionPos = nullptr;
     bool inSingleLineComment = false;
     bool inMultiLineComment = false;
     bool foundVersionStart = false;
@@ -325,8 +325,8 @@ void QSGShaderSourceBuilder::removeVersion()
     tok.initialize(input);
 
     // First find #version beginning and end (if present)
-    const char *versionStartPos = 0;
-    const char *versionEndPos = 0;
+    const char *versionStartPos = nullptr;
+    const char *versionEndPos = nullptr;
     bool inSingleLineComment = false;
     bool inMultiLineComment = false;
     bool foundVersionStart = false;
@@ -361,7 +361,7 @@ void QSGShaderSourceBuilder::removeVersion()
         t = tok.next();
     }
 
-    if (versionStartPos == 0)
+    if (versionStartPos == nullptr)
         return;
 
     // Construct a new shader string, inserting the definition
diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h
index 8a81917bd2..dcf9b89b21 100644
--- a/src/quick/scenegraph/util/qsgsimplematerial.h
+++ b/src/quick/scenegraph/util/qsgsimplematerial.h
@@ -207,7 +207,7 @@ Q_INLINE_TEMPLATE void QSGSimpleMaterialShader<State>::updateState(const RenderS
     Q_UNUSED(state)
 #endif
     State *ns = static_cast<QSGSimpleMaterial<State> *>(newMaterial)->state();
-    State *old = 0;
+    State *old = nullptr;
     if (oldMaterial)
         old = static_cast<QSGSimpleMaterial<State> *>(oldMaterial)->state();
     updateState(ns, old);
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index d2599ebd72..fea92a5121 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -399,7 +399,7 @@ QSGTexture::~QSGTexture()
 QSGTexture *QSGTexture::removedFromAtlas() const
 {
     Q_ASSERT_X(!isAtlasTexture(), "QSGTexture::removedFromAtlas()", "Called on a non-atlas texture");
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index 0f9ee9cfde..70a8b321d8 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -67,7 +67,7 @@ QSGOpaqueTextureMaterialShader::QSGOpaqueTextureMaterialShader()
 
 char const *const *QSGOpaqueTextureMaterialShader::attributeNames() const
 {
-    static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", 0 };
+    static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", nullptr };
     return attr;
 }
 
@@ -80,7 +80,7 @@ void QSGOpaqueTextureMaterialShader::initialize()
 
 void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
     QSGOpaqueTextureMaterial *tx = static_cast<QSGOpaqueTextureMaterial *>(newEffect);
     QSGOpaqueTextureMaterial *oldTx = static_cast<QSGOpaqueTextureMaterial *>(oldEffect);
 
@@ -112,7 +112,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa
     t->setMipmapFiltering(tx->mipmapFiltering());
     t->setAnisotropyLevel(tx->anisotropyLevel());
 
-    if (oldTx == 0 || oldTx->texture()->textureId() != t->textureId())
+    if (oldTx == nullptr || oldTx->texture()->textureId() != t->textureId())
         t->bind();
     else
         t->updateBindOptions();
@@ -169,7 +169,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa
 
  */
 QSGOpaqueTextureMaterial::QSGOpaqueTextureMaterial()
-    : m_texture(0)
+    : m_texture(nullptr)
     , m_filtering(QSGTexture::Nearest)
     , m_mipmap_filtering(QSGTexture::None)
     , m_horizontal_wrap(QSGTexture::ClampToEdge)
@@ -398,7 +398,7 @@ QSGTextureMaterialShader::QSGTextureMaterialShader()
 
 void QSGTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
 #if QT_CONFIG(opengl)
     if (state.isOpacityDirty())
         program()->setUniformValue(m_opacity_id, state.opacity());
diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
index 42c589b14a..f1ad73af1b 100644
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
@@ -87,7 +87,7 @@ void QSGVertexColorMaterialShader::updateState(const RenderState &state, QSGMate
 
 char const *const *QSGVertexColorMaterialShader::attributeNames() const
 {
-    static const char *const attr[] = { "vertexCoord", "vertexColor", 0 };
+    static const char *const attr[] = { "vertexCoord", "vertexColor", nullptr };
     return attr;
 }
 
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 76b9b8f343..c936ba4e93 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -91,7 +91,7 @@ QQuickAbstractAnimation::~QQuickAbstractAnimation()
 {
     Q_D(QQuickAbstractAnimation);
     if (d->group)
-        setGroup(0);    //remove from group
+        setGroup(nullptr);    //remove from group
     delete d->animationInstance;
 }
 
@@ -643,7 +643,7 @@ QAbstractAnimationJob* QQuickAbstractAnimation::transition(QQuickStateActions &a
     Q_UNUSED(modified);
     Q_UNUSED(direction);
     Q_UNUSED(defaultTarget);
-    return 0;
+    return nullptr;
 }
 
 void QQuickAbstractAnimationPrivate::animationFinished(QAbstractAnimationJob*)
@@ -838,7 +838,7 @@ void QQuickColorAnimation::setTo(const QColor &t)
 }
 
 QActionAnimation::QActionAnimation()
-    : QAbstractAnimationJob(), animAction(0)
+    : QAbstractAnimationJob(), animAction(nullptr)
 {
 }
 
@@ -1706,7 +1706,7 @@ void QQuickAnimationGroupPrivate::clear_animation(QQmlListProperty<QQuickAbstrac
     if (q) {
         while (q->d_func()->animations.count()) {
             QQuickAbstractAnimation *firstAnim = q->d_func()->animations.at(0);
-            firstAnim->setGroup(0);
+            firstAnim->setGroup(nullptr);
         }
     }
 }
@@ -1715,7 +1715,7 @@ QQuickAnimationGroup::~QQuickAnimationGroup()
 {
     Q_D(QQuickAnimationGroup);
     for (int i = 0; i < d->animations.count(); ++i)
-        d->animations.at(i)->d_func()->group = 0;
+        d->animations.at(i)->d_func()->group = nullptr;
     d->animations.clear();
 }
 
@@ -1937,7 +1937,7 @@ void QQuickPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
 }
 
 QQuickBulkValueAnimator::QQuickBulkValueAnimator()
-    : QAbstractAnimationJob(), animValue(0), fromSourced(0), m_duration(250)
+    : QAbstractAnimationJob(), animValue(nullptr), fromSourced(nullptr), m_duration(250)
 {
 }
 
@@ -2556,7 +2556,7 @@ void QQuickAnimationPropertyUpdater::setValue(qreal v)
         if (deleted)
             return;
     }
-    wasDeleted = 0;
+    wasDeleted = nullptr;
     fromSourced = true;
 }
 
diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h
index 5edbcc089a..d1f460fef7 100644
--- a/src/quick/util/qquickanimation_p.h
+++ b/src/quick/util/qquickanimation_p.h
@@ -87,7 +87,7 @@ public:
         AnyThread
     };
 
-    QQuickAbstractAnimation(QObject *parent=0);
+    QQuickAbstractAnimation(QObject *parent=nullptr);
     virtual ~QQuickAbstractAnimation();
 
     enum Loops { Infinite = -2 };
@@ -144,7 +144,7 @@ public:
     virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = nullptr);
     QAbstractAnimationJob* qtAnimation();
 
 private Q_SLOTS:
@@ -166,7 +166,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPauseAnimation : public QQuickAbstractAnimati
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
 
 public:
-    QQuickPauseAnimation(QObject *parent=0);
+    QQuickPauseAnimation(QObject *parent=nullptr);
     virtual ~QQuickPauseAnimation();
 
     int duration() const;
@@ -179,7 +179,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                                           QQmlProperties &modified,
                                           TransitionDirection direction,
-                                          QObject *defaultTarget = 0) override;
+                                          QObject *defaultTarget = nullptr) override;
 };
 
 class QQuickScriptActionPrivate;
@@ -192,7 +192,7 @@ class QQuickScriptAction : public QQuickAbstractAnimation
     Q_PROPERTY(QString scriptName READ stateChangeScriptName WRITE setStateChangeScriptName)
 
 public:
-    QQuickScriptAction(QObject *parent=0);
+    QQuickScriptAction(QObject *parent=nullptr);
     virtual ~QQuickScriptAction();
 
     QQmlScriptString script() const;
@@ -205,7 +205,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 };
 
 class QQuickPropertyActionPrivate;
@@ -222,7 +222,7 @@ class QQuickPropertyAction : public QQuickAbstractAnimation
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    QQuickPropertyAction(QObject *parent=0);
+    QQuickPropertyAction(QObject *parent=nullptr);
     virtual ~QQuickPropertyAction();
 
     QObject *target() const;
@@ -250,7 +250,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 };
 
 class QQuickPropertyAnimationPrivate;
@@ -270,7 +270,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAnimation : public QQuickAbstractAnim
     Q_PROPERTY(QQmlListProperty<QObject> exclude READ exclude)
 
 public:
-    QQuickPropertyAnimation(QObject *parent=0);
+    QQuickPropertyAnimation(QObject *parent=nullptr);
     virtual ~QQuickPropertyAnimation();
 
     virtual int duration() const;
@@ -300,13 +300,13 @@ public:
 protected:
     QQuickStateActions createTransitionActions(QQuickStateActions &actions,
                                                      QQmlProperties &modified,
-                                                     QObject *defaultTarget = 0);
+                                                     QObject *defaultTarget = nullptr);
 
     QQuickPropertyAnimation(QQuickPropertyAnimationPrivate &dd, QObject *parent);
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 Q_SIGNALS:
     void durationChanged(int);
     void fromChanged();
@@ -325,7 +325,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickColorAnimation : public QQuickPropertyAnimati
     Q_PROPERTY(QColor to READ to WRITE setTo)
 
 public:
-    QQuickColorAnimation(QObject *parent=0);
+    QQuickColorAnimation(QObject *parent=nullptr);
     virtual ~QQuickColorAnimation();
 
     QColor from() const;
@@ -344,7 +344,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickNumberAnimation : public QQuickPropertyAnimat
     Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
 
 public:
-    QQuickNumberAnimation(QObject *parent=0);
+    QQuickNumberAnimation(QObject *parent=nullptr);
     virtual ~QQuickNumberAnimation();
 
     qreal from() const;
@@ -369,7 +369,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickVector3dAnimation : public QQuickPropertyAnim
     Q_PROPERTY(QVector3D to READ to WRITE setTo NOTIFY toChanged)
 
 public:
-    QQuickVector3dAnimation(QObject *parent=0);
+    QQuickVector3dAnimation(QObject *parent=nullptr);
     virtual ~QQuickVector3dAnimation();
 
     QVector3D from() const;
@@ -390,7 +390,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickRotationAnimation : public QQuickPropertyAnim
     Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
 
 public:
-    QQuickRotationAnimation(QObject *parent=0);
+    QQuickRotationAnimation(QObject *parent=nullptr);
     virtual ~QQuickRotationAnimation();
 
     qreal from() const;
@@ -434,7 +434,7 @@ class QQuickSequentialAnimation : public QQuickAnimationGroup
     Q_DECLARE_PRIVATE(QQuickAnimationGroup)
 
 public:
-    QQuickSequentialAnimation(QObject *parent=0);
+    QQuickSequentialAnimation(QObject *parent=nullptr);
     virtual ~QQuickSequentialAnimation();
 
 protected:
@@ -442,7 +442,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 };
 
 class Q_QUICK_PRIVATE_EXPORT QQuickParallelAnimation : public QQuickAnimationGroup
@@ -451,7 +451,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickParallelAnimation : public QQuickAnimationGro
     Q_DECLARE_PRIVATE(QQuickAnimationGroup)
 
 public:
-    QQuickParallelAnimation(QObject *parent=0);
+    QQuickParallelAnimation(QObject *parent=nullptr);
     virtual ~QQuickParallelAnimation();
 
 protected:
@@ -459,7 +459,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 };
 
 
diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h
index 7a1bd8ff13..304258cde1 100644
--- a/src/quick/util/qquickanimation_p_p.h
+++ b/src/quick/util/qquickanimation_p_p.h
@@ -178,7 +178,7 @@ public:
     : running(false), paused(false), alwaysRunToEnd(false),
       /*connectedTimeLine(false), */componentComplete(true),
       avoidPropertyValueSourceStart(false), disableUserControl(false),
-      registered(false), loopCount(1), group(0), animationInstance(0) {}
+      registered(false), loopCount(1), group(nullptr), animationInstance(nullptr) {}
 
     bool running:1;
     bool paused:1;
@@ -237,7 +237,7 @@ class QQuickPropertyActionPrivate : public QQuickAbstractAnimationPrivate
     Q_DECLARE_PUBLIC(QQuickPropertyAction)
 public:
     QQuickPropertyActionPrivate()
-    : QQuickAbstractAnimationPrivate(), target(0) {}
+    : QQuickAbstractAnimationPrivate(), target(nullptr) {}
 
     QObject *target;
     QString propertyName;
@@ -265,8 +265,8 @@ class QQuickPropertyAnimationPrivate : public QQuickAbstractAnimationPrivate
     Q_DECLARE_PUBLIC(QQuickPropertyAnimation)
 public:
     QQuickPropertyAnimationPrivate()
-    : QQuickAbstractAnimationPrivate(), target(0), fromSourced(false), fromIsDefined(false), toIsDefined(false),
-      defaultToInterpolatorType(0), interpolatorType(0), interpolator(0), duration(250), actions(0) {}
+    : QQuickAbstractAnimationPrivate(), target(nullptr), fromSourced(false), fromIsDefined(false), toIsDefined(false),
+      defaultToInterpolatorType(0), interpolatorType(0), interpolator(nullptr), duration(250), actions(nullptr) {}
 
     QVariant from;
     QVariant to;
@@ -306,7 +306,7 @@ public:
 class Q_AUTOTEST_EXPORT QQuickAnimationPropertyUpdater : public QQuickBulkValueUpdater
 {
 public:
-    QQuickAnimationPropertyUpdater() : interpolatorType(0), interpolator(0), prevInterpolatorType(0), reverse(false), fromSourced(false), fromDefined(false), wasDeleted(0) {}
+    QQuickAnimationPropertyUpdater() : interpolatorType(0), interpolator(nullptr), prevInterpolatorType(0), reverse(false), fromSourced(false), fromDefined(false), wasDeleted(nullptr) {}
     ~QQuickAnimationPropertyUpdater();
 
     void setValue(qreal v) override;
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index 5e56460098..63373541a6 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -49,7 +49,7 @@ class QQuickAnimationControllerPrivate : public QObjectPrivate, QAnimationJobCha
     Q_DECLARE_PUBLIC(QQuickAnimationController)
 public:
     QQuickAnimationControllerPrivate()
-        : progress(0.0), animation(0), animationInstance(0), finalized(false) {}
+        : progress(0.0), animation(nullptr), animationInstance(nullptr), finalized(false) {}
     void animationFinished(QAbstractAnimationJob *job) override;
     void animationCurrentTimeChanged(QAbstractAnimationJob *job, int currentTime) override;
 
@@ -197,7 +197,7 @@ void QQuickAnimationController::reload()
         return;
 
     if (!d->animation) {
-        d->animationInstance = 0;
+        d->animationInstance = nullptr;
     } else {
         QQuickStateActions actions;
         QQmlProperties properties;
diff --git a/src/quick/util/qquickanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h
index 43555ac1c1..d9ce377060 100644
--- a/src/quick/util/qquickanimationcontroller_p.h
+++ b/src/quick/util/qquickanimationcontroller_p.h
@@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QQuickAnimationController : public QObject, public QQmlP
     Q_PROPERTY(QQuickAbstractAnimation *animation READ animation WRITE setAnimation NOTIFY animationChanged)
 
 public:
-    QQuickAnimationController(QObject *parent=0);
+    QQuickAnimationController(QObject *parent=nullptr);
     ~QQuickAnimationController();
 
     qreal progress() const;
diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp
index 5608326f8a..d1ff78f8bc 100644
--- a/src/quick/util/qquickanimator.cpp
+++ b/src/quick/util/qquickanimator.cpp
@@ -280,22 +280,22 @@ QAbstractAnimationJob *QQuickAnimator::transition(QQuickStateActions &actions,
 
     if (d->defaultProperty.isValid() && propertyName() != d->defaultProperty.name()) {
         qDebug() << Q_FUNC_INFO << "property name conflict...";
-        return 0;
+        return nullptr;
     }
 
     // The animation system cannot handle backwards uncontrolled animations.
     if (direction == Backward)
-        return 0;
+        return nullptr;
 
     QQuickAnimatorJob *job = createJob();
     if (!job)
-        return 0;
+        return nullptr;
 
     d->apply(job, propertyName(), actions, modified, defaultTarget);
 
     if (!job->target()) {
         delete job;
-        return 0;
+        return nullptr;
     }
 
     return job;
@@ -576,7 +576,7 @@ QQuickAnimatorJob *QQuickUniformAnimator::createJob() const
 {
     QString u = propertyName();
     if (u.isEmpty())
-        return 0;
+        return nullptr;
 
     QQuickUniformAnimatorJob *job = new QQuickUniformAnimatorJob();
     job->setUniform(u.toLatin1());
diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h
index 92c66299dc..511cecda7f 100644
--- a/src/quick/util/qquickanimator_p.h
+++ b/src/quick/util/qquickanimator_p.h
@@ -94,8 +94,8 @@ protected:
                                       TransitionDirection,
                                       QObject *) override;
 
-    QQuickAnimator(QQuickAnimatorPrivate &dd, QObject *parent = 0);
-    QQuickAnimator(QObject *parent = 0);
+    QQuickAnimator(QQuickAnimatorPrivate &dd, QObject *parent = nullptr);
+    QQuickAnimator(QObject *parent = nullptr);
 
 Q_SIGNALS:
     void targetItemChanged(QQuickItem *);
@@ -110,7 +110,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickScaleAnimator : public QQuickAnimator
 {
     Q_OBJECT
 public:
-    QQuickScaleAnimator(QObject *parent = 0);
+    QQuickScaleAnimator(QObject *parent = nullptr);
 protected:
     QQuickAnimatorJob *createJob() const override;
     QString propertyName() const override { return QStringLiteral("scale"); }
@@ -120,7 +120,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickXAnimator : public QQuickAnimator
 {
     Q_OBJECT
 public:
-    QQuickXAnimator(QObject *parent = 0);
+    QQuickXAnimator(QObject *parent = nullptr);
 protected:
     QQuickAnimatorJob *createJob() const override;
     QString propertyName() const override { return QStringLiteral("x"); }
@@ -130,7 +130,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickYAnimator : public QQuickAnimator
 {
     Q_OBJECT
 public:
-    QQuickYAnimator(QObject *parent = 0);
+    QQuickYAnimator(QObject *parent = nullptr);
 protected:
     QQuickAnimatorJob *createJob() const override;
     QString propertyName() const override { return QStringLiteral("y"); }
@@ -140,7 +140,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickOpacityAnimator : public QQuickAnimator
 {
     Q_OBJECT
 public:
-    QQuickOpacityAnimator(QObject *parent = 0);
+    QQuickOpacityAnimator(QObject *parent = nullptr);
 protected:
     QQuickAnimatorJob *createJob() const override;
     QString propertyName() const override { return QStringLiteral("opacity"); }
@@ -157,7 +157,7 @@ public:
     enum RotationDirection { Numerical, Shortest, Clockwise, Counterclockwise };
     Q_ENUM(RotationDirection)
 
-    QQuickRotationAnimator(QObject *parent = 0);
+    QQuickRotationAnimator(QObject *parent = nullptr);
 
     void setDirection(RotationDirection dir);
     RotationDirection direction() const;
@@ -179,7 +179,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickUniformAnimator : public QQuickAnimator
     Q_PROPERTY(QString uniform READ uniform WRITE setUniform NOTIFY uniformChanged)
 
 public:
-    QQuickUniformAnimator(QObject *parent = 0);
+    QQuickUniformAnimator(QObject *parent = nullptr);
 
     QString uniform() const;
     void setUniform(const QString &);
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 43c8eb302a..6574f8f67e 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -250,8 +250,8 @@ void QQuickAnimatorProxyJob::syncBackCurrentValues()
 }
 
 QQuickAnimatorJob::QQuickAnimatorJob()
-    : m_target(0)
-    , m_controller(0)
+    : m_target(nullptr)
+    , m_controller(nullptr)
     , m_from(0)
     , m_to(0)
     , m_value(0)
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 777da2ee6c..74085526c0 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -194,7 +194,7 @@ public:
     {
         Helper()
             : ref(1)
-            , node(0)
+            , node(nullptr)
             , ox(0)
             , oy(0)
             , dx(0)
diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index 8ee203f0da..66a33489e4 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT QQuickApplication : public QQmlApplication
     Q_PROPERTY(QQmlListProperty<QQuickScreenInfo> screens READ screens NOTIFY screensChanged)
 
 public:
-    explicit QQuickApplication(QObject *parent = 0);
+    explicit QQuickApplication(QObject *parent = nullptr);
     virtual ~QQuickApplication();
     bool active() const;
     Qt::LayoutDirection layoutDirection() const;
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index a562ebd937..8a4ff6a779 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -57,7 +57,7 @@ class QQuickBehaviorPrivate : public QObjectPrivate, public QAnimationJobChangeL
 {
     Q_DECLARE_PUBLIC(QQuickBehavior)
 public:
-    QQuickBehaviorPrivate() : animation(0), animationInstance(0), enabled(true), finalized(false)
+    QQuickBehaviorPrivate() : animation(nullptr), animationInstance(nullptr), enabled(true), finalized(false)
       , blockRunningChanged(false) {}
 
     void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) override;
diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h
index b3fd2af400..f939597d15 100644
--- a/src/quick/util/qquickbehavior_p.h
+++ b/src/quick/util/qquickbehavior_p.h
@@ -72,7 +72,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickBehavior : public QObject, public QQmlPropert
     Q_CLASSINFO("DeferredPropertyNames", "animation")
 
 public:
-    QQuickBehavior(QObject *parent=0);
+    QQuickBehavior(QObject *parent=nullptr);
     ~QQuickBehavior();
 
     void setTarget(const QQmlProperty &) override;
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 68e27c25fd..72b9149886 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -91,9 +91,9 @@ public:
 };
 
 QQuickFontObject::QQuickFontObject(int _id)
-    : QObject(0)
+    : QObject(nullptr)
 #if QT_CONFIG(qml_network)
-    ,redirectCount(0), reply(0)
+    ,redirectCount(0), reply(nullptr)
 #endif
     ,id(_id)
 {
@@ -119,7 +119,7 @@ void QQuickFontObject::replyFinished()
                 QUrl url = reply->url().resolved(redirect.toUrl());
                 QNetworkAccessManager *manager = reply->manager();
                 reply->deleteLater();
-                reply = 0;
+                reply = nullptr;
                 download(url, manager);
                 return;
             }
@@ -138,7 +138,7 @@ void QQuickFontObject::replyFinished()
             emit fontDownloaded(QString(), QQuickFontLoader::Error);
         }
         reply->deleteLater();
-        reply = 0;
+        reply = nullptr;
     }
 }
 #endif // qml_network
diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h
index 29feecde4f..8d277f7cf7 100644
--- a/src/quick/util/qquickfontloader_p.h
+++ b/src/quick/util/qquickfontloader_p.h
@@ -72,7 +72,7 @@ public:
     enum Status { Null = 0, Ready, Loading, Error };
     Q_ENUM(Status)
 
-    QQuickFontLoader(QObject *parent = 0);
+    QQuickFontLoader(QObject *parent = nullptr);
     ~QQuickFontLoader();
 
     QUrl source() const;
diff --git a/src/quick/util/qquickfontmetrics_p.h b/src/quick/util/qquickfontmetrics_p.h
index ebabe51712..db2b7b6796 100644
--- a/src/quick/util/qquickfontmetrics_p.h
+++ b/src/quick/util/qquickfontmetrics_p.h
@@ -80,7 +80,7 @@ class Q_AUTOTEST_EXPORT QQuickFontMetrics : public QObject
     Q_PROPERTY(qreal strikeOutPosition READ strikeOutPosition NOTIFY fontChanged)
     Q_PROPERTY(qreal lineWidth READ lineWidth NOTIFY fontChanged)
 public:
-    explicit QQuickFontMetrics(QObject *parent = 0);
+    explicit QQuickFontMetrics(QObject *parent = nullptr);
     ~QQuickFontMetrics();
 
     QFont font() const;
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 5f8d2b94d3..7fa20636ec 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -419,7 +419,7 @@ public:
             break;
         }
 
-        return 0;
+        return nullptr;
     }
 
     bool init(int type, QVariant& dst) override
@@ -863,8 +863,8 @@ void QQuick_initializeProviders()
 void QQuick_deinitializeProviders()
 {
     QQml_removeValueTypeProvider(getValueTypeProvider());
-    QQml_setColorProvider(0); // technically, another plugin may have overridden our providers
-    QQml_setGuiProvider(0);   // but we cannot handle that case in a sane way.
+    QQml_setColorProvider(nullptr); // technically, another plugin may have overridden our providers
+    QQml_setGuiProvider(nullptr);   // but we cannot handle that case in a sane way.
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index 4003b88d09..e7891a6612 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -108,7 +108,7 @@ QImage QQuickTextureFactory::image() const
 QQuickTextureFactory *QQuickTextureFactory::textureFactoryForImage(const QImage &image)
 {
     if (image.isNull())
-        return 0;
+        return nullptr;
     QQuickTextureFactory *texture = QSGContext::createTextureFactoryFromImage(image);
     if (texture)
         return texture;
@@ -469,7 +469,7 @@ QQuickTextureFactory *QQuickImageProvider::requestTexture(const QString &id, QSi
     Q_UNUSED(requestedSize);
     if (d->type == Texture)
         qWarning("ImageProvider supports Texture type but has not implemented requestTexture()");
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -484,7 +484,7 @@ QQuickTextureFactory *QQuickImageProvider::requestTexture(const QString &id, QSi
 */
 QQuickAsyncImageProvider::QQuickAsyncImageProvider()
  : QQuickImageProvider(ImageResponse, ForceAsynchronousImageLoading)
- , d(0) // just as a placeholder in case we need it for the future
+ , d(nullptr) // just as a placeholder in case we need it for the future
 {
     Q_UNUSED(d);
 }
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 1ae9b78669..56eafcd12a 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -256,7 +256,7 @@ bool QQuickPath::isClosed() const
 QQmlListProperty<QQuickPathElement> QQuickPath::pathElements()
 {
     return QQmlListProperty<QQuickPathElement>(this,
-                                               0,
+                                               nullptr,
                                                pathElements_append,
                                                pathElements_count,
                                                pathElements_at,
diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h
index a49403fd0e..06f6800a0e 100644
--- a/src/quick/util/qquickpath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -78,7 +78,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathElement : public QObject
 {
     Q_OBJECT
 public:
-    QQuickPathElement(QObject *parent=0) : QObject(parent) {}
+    QQuickPathElement(QObject *parent=nullptr) : QObject(parent) {}
 Q_SIGNALS:
     void changed();
 };
@@ -90,7 +90,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathAttribute : public QQuickPathElement
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
 public:
-    QQuickPathAttribute(QObject *parent=0) : QQuickPathElement(parent), _value(0) {}
+    QQuickPathAttribute(QObject *parent=nullptr) : QQuickPathElement(parent), _value(0) {}
 
 
     QString name() const;
@@ -117,7 +117,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickCurve : public QQuickPathElement
     Q_PROPERTY(qreal relativeX READ relativeX WRITE setRelativeX NOTIFY relativeXChanged)
     Q_PROPERTY(qreal relativeY READ relativeY WRITE setRelativeY NOTIFY relativeYChanged)
 public:
-    QQuickCurve(QObject *parent=0) : QQuickPathElement(parent) {}
+    QQuickCurve(QObject *parent=nullptr) : QQuickPathElement(parent) {}
 
     qreal x() const;
     void setX(qreal x);
@@ -154,7 +154,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathLine : public QQuickCurve
 {
     Q_OBJECT
 public:
-    QQuickPathLine(QObject *parent=0) : QQuickCurve(parent) {}
+    QQuickPathLine(QObject *parent=nullptr) : QQuickCurve(parent) {}
 
     void addToPath(QPainterPath &path, const QQuickPathData &) override;
 };
@@ -163,7 +163,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathMove : public QQuickCurve
 {
     Q_OBJECT
 public:
-    QQuickPathMove(QObject *parent=0) : QQuickCurve(parent) {}
+    QQuickPathMove(QObject *parent=nullptr) : QQuickCurve(parent) {}
 
     void addToPath(QPainterPath &path, const QQuickPathData &) override;
 };
@@ -177,7 +177,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathQuad : public QQuickCurve
     Q_PROPERTY(qreal relativeControlX READ relativeControlX WRITE setRelativeControlX NOTIFY relativeControlXChanged)
     Q_PROPERTY(qreal relativeControlY READ relativeControlY WRITE setRelativeControlY NOTIFY relativeControlYChanged)
 public:
-    QQuickPathQuad(QObject *parent=0) : QQuickCurve(parent), _controlX(0), _controlY(0) {}
+    QQuickPathQuad(QObject *parent=nullptr) : QQuickCurve(parent), _controlX(0), _controlY(0) {}
 
     qreal controlX() const;
     void setControlX(qreal x);
@@ -221,7 +221,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathCubic : public QQuickCurve
     Q_PROPERTY(qreal relativeControl2X READ relativeControl2X WRITE setRelativeControl2X NOTIFY relativeControl2XChanged)
     Q_PROPERTY(qreal relativeControl2Y READ relativeControl2Y WRITE setRelativeControl2Y NOTIFY relativeControl2YChanged)
 public:
-    QQuickPathCubic(QObject *parent=0) : QQuickCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {}
+    QQuickPathCubic(QObject *parent=nullptr) : QQuickCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {}
 
     qreal control1X() const;
     void setControl1X(qreal x);
@@ -278,7 +278,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathCatmullRomCurve : public QQuickCurve
 {
     Q_OBJECT
 public:
-    QQuickPathCatmullRomCurve(QObject *parent=0) : QQuickCurve(parent) {}
+    QQuickPathCatmullRomCurve(QObject *parent=nullptr) : QQuickCurve(parent) {}
 
     void addToPath(QPainterPath &path, const QQuickPathData &) override;
 };
@@ -293,7 +293,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathArc : public QQuickCurve
     Q_PROPERTY(qreal xAxisRotation READ xAxisRotation WRITE setXAxisRotation NOTIFY xAxisRotationChanged REVISION 2)
 
 public:
-    QQuickPathArc(QObject *parent=0)
+    QQuickPathArc(QObject *parent=nullptr)
         : QQuickCurve(parent), _radiusX(0), _radiusY(0), _useLargeArc(false), _direction(Clockwise), _xAxisRotation(0) {}
 
     enum ArcDirection { Clockwise, Counterclockwise };
@@ -343,7 +343,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathAngleArc : public QQuickCurve
     Q_PROPERTY(bool moveToStart READ moveToStart WRITE setMoveToStart NOTIFY moveToStartChanged)
 
 public:
-    QQuickPathAngleArc(QObject *parent=0)
+    QQuickPathAngleArc(QObject *parent=nullptr)
         : QQuickCurve(parent), _centerX(0), _centerY(0), _radiusX(0), _radiusY(0), _startAngle(0), _sweepAngle(0), _moveToStart(true) {}
 
     qreal centerX() const;
@@ -393,7 +393,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathSvg : public QQuickCurve
     Q_OBJECT
     Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
 public:
-    QQuickPathSvg(QObject *parent=0) : QQuickCurve(parent) {}
+    QQuickPathSvg(QObject *parent=nullptr) : QQuickCurve(parent) {}
 
     QString path() const;
     void setPath(const QString &path);
@@ -412,7 +412,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathPercent : public QQuickPathElement
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
 public:
-    QQuickPathPercent(QObject *parent=0) : QQuickPathElement(parent), _value(0) {}
+    QQuickPathPercent(QObject *parent=nullptr) : QQuickPathElement(parent), _value(0) {}
 
     qreal value() const;
     void setValue(qreal value);
@@ -448,7 +448,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPath : public QObject, public QQmlParserStatu
     Q_CLASSINFO("DefaultProperty", "pathElements")
     Q_INTERFACES(QQmlParserStatus)
 public:
-    QQuickPath(QObject *parent=0);
+    QQuickPath(QObject *parent=nullptr);
     ~QQuickPath();
 
     QQmlListProperty<QQuickPathElement> pathElements();
@@ -467,7 +467,7 @@ public:
     QStringList attributes() const;
     qreal attributeAt(const QString &, qreal) const;
     QPointF pointAt(qreal) const;
-    QPointF sequentialPointAt(qreal p, qreal *angle = 0) const;
+    QPointF sequentialPointAt(qreal p, qreal *angle = nullptr) const;
     void invalidateSequentialHistory() const;
 
 Q_SIGNALS:
@@ -512,8 +512,8 @@ private:
 
     static void interpolate(QList<AttributePoint> &points, int idx, const QString &name, qreal value);
     static void endpoint(QList<AttributePoint> &attributePoints, const QString &name);
-    static QPointF forwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = 0);
-    static QPointF backwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = 0);
+    static QPointF forwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = nullptr);
+    static QPointF backwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = nullptr);
 
 private:
     Q_DISABLE_COPY(QQuickPath)
@@ -521,9 +521,9 @@ private:
     friend class QQuickPathAnimationUpdater;
 
 public:
-    QPainterPath createPath(const QPointF &startPoint, const QPointF &endPoint, const QStringList &attributes, qreal &pathLength, QList<AttributePoint> &attributePoints, bool *closed = 0);
-    QPainterPath createShapePath(const QPointF &startPoint, const QPointF &endPoint, qreal &pathLength, bool *closed = 0);
-    static QPointF sequentialPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = 0);
+    QPainterPath createPath(const QPointF &startPoint, const QPointF &endPoint, const QStringList &attributes, qreal &pathLength, QList<AttributePoint> &attributePoints, bool *closed = nullptr);
+    QPainterPath createShapePath(const QPointF &startPoint, const QPointF &endPoint, qreal &pathLength, bool *closed = nullptr);
+    static QPointF sequentialPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/util/qquickpathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp
index 838213042e..bb47ca0205 100644
--- a/src/quick/util/qquickpathinterpolator.cpp
+++ b/src/quick/util/qquickpathinterpolator.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QQuickPathInterpolator::QQuickPathInterpolator(QObject *parent) :
-    QObject(parent), _path(0), _x(0), _y(0), _angle(0), _progress(0)
+    QObject(parent), _path(nullptr), _x(0), _y(0), _angle(0), _progress(0)
 {
 }
 
diff --git a/src/quick/util/qquickpathinterpolator_p.h b/src/quick/util/qquickpathinterpolator_p.h
index 0fdb1a444f..60a9ff2e22 100644
--- a/src/quick/util/qquickpathinterpolator_p.h
+++ b/src/quick/util/qquickpathinterpolator_p.h
@@ -70,7 +70,7 @@ class Q_AUTOTEST_EXPORT QQuickPathInterpolator : public QObject
     Q_PROPERTY(qreal y READ y NOTIFY yChanged)
     Q_PROPERTY(qreal angle READ angle NOTIFY angleChanged)
 public:
-    explicit QQuickPathInterpolator(QObject *parent = 0);
+    explicit QQuickPathInterpolator(QObject *parent = nullptr);
 
     QQuickPath *path() const;
     void setPath(QQuickPath *path);
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 7097bcc156..e1937aeec2 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -244,8 +244,8 @@ public:
     : refCount(1), inCache(false), pixmapStatus(QQuickPixmap::Error),
       url(u), errorString(e), requestSize(s),
       providerOptions(po), appliedTransform(QQuickImageProviderOptions::UsePluginDefaultTransform),
-      textureFactory(0), reply(0), prevUnreferenced(0),
-      prevUnreferencedPtr(0), nextUnreferenced(0)
+      textureFactory(nullptr), reply(nullptr), prevUnreferenced(nullptr),
+      prevUnreferencedPtr(nullptr), nextUnreferenced(nullptr)
     {
         declarativePixmaps.insert(pixmap);
     }
@@ -254,8 +254,8 @@ public:
     : refCount(1), inCache(false), pixmapStatus(QQuickPixmap::Loading),
       url(u), requestSize(r),
       providerOptions(po), appliedTransform(aTransform),
-      textureFactory(0), reply(0), prevUnreferenced(0), prevUnreferencedPtr(0),
-      nextUnreferenced(0)
+      textureFactory(nullptr), reply(nullptr), prevUnreferenced(nullptr), prevUnreferencedPtr(nullptr),
+      nextUnreferenced(nullptr)
     {
         declarativePixmaps.insert(pixmap);
     }
@@ -265,8 +265,8 @@ public:
     : refCount(1), inCache(false), pixmapStatus(QQuickPixmap::Ready),
       url(u), implicitSize(s), requestSize(r),
       providerOptions(po), appliedTransform(aTransform),
-      textureFactory(texture), reply(0), prevUnreferenced(0),
-      prevUnreferencedPtr(0), nextUnreferenced(0)
+      textureFactory(texture), reply(nullptr), prevUnreferenced(nullptr),
+      prevUnreferencedPtr(nullptr), nextUnreferenced(nullptr)
     {
         declarativePixmaps.insert(pixmap);
     }
@@ -274,8 +274,8 @@ public:
     QQuickPixmapData(QQuickPixmap *pixmap, QQuickTextureFactory *texture)
     : refCount(1), inCache(false), pixmapStatus(QQuickPixmap::Ready),
       appliedTransform(QQuickImageProviderOptions::UsePluginDefaultTransform),
-      textureFactory(texture), reply(0), prevUnreferenced(0),
-      prevUnreferencedPtr(0), nextUnreferenced(0)
+      textureFactory(texture), reply(nullptr), prevUnreferenced(nullptr),
+      prevUnreferencedPtr(nullptr), nextUnreferenced(nullptr)
     {
         if (texture)
             requestSize = implicitSize = texture->textureSize();
@@ -287,7 +287,7 @@ public:
         while (!declarativePixmaps.isEmpty()) {
             QQuickPixmap *referencer = declarativePixmaps.first();
             declarativePixmaps.remove(referencer);
-            referencer->d = 0;
+            referencer->d = nullptr;
         }
         delete textureFactory;
     }
@@ -443,9 +443,9 @@ static QString existingImageFileForPath(const QString &localFile)
 }
 
 QQuickPixmapReader::QQuickPixmapReader(QQmlEngine *eng)
-: QThread(eng), engine(eng), threadObject(0)
+: QThread(eng), engine(eng), threadObject(nullptr)
 #if QT_CONFIG(qml_network)
-, accessManager(0)
+, accessManager(nullptr)
 #endif
 {
     eventLoopQuitHack = new QObject;
@@ -464,7 +464,7 @@ QQuickPixmapReader::~QQuickPixmapReader()
     // manually cancel all outstanding jobs.
     for (QQuickPixmapReply *reply : qAsConst(jobs)) {
         if (reply->data && reply->data->reply == reply)
-            reply->data->reply = 0;
+            reply->data->reply = nullptr;
         delete reply;
     }
     jobs.clear();
@@ -473,7 +473,7 @@ QQuickPixmapReader::~QQuickPixmapReader()
     const auto cancelJob = [this](QQuickPixmapReply *reply) {
         if (reply->loading) {
             cancelled.append(reply);
-            reply->data = 0;
+            reply->data = nullptr;
         }
     };
 
@@ -547,7 +547,7 @@ void QQuickPixmapReader::asyncResponseFinished(QQuickImageResponse *response)
     QQuickPixmapReply *job = asyncResponses.take(response);
 
     if (job) {
-        QQuickTextureFactory *t = 0;
+        QQuickTextureFactory *t = nullptr;
         QQuickPixmapReply::ReadError error = QQuickPixmapReply::NoError;
         QString errorString;
         if (!response->errorString().isEmpty()) {
@@ -646,7 +646,7 @@ void QQuickPixmapReader::processJobs()
                 const QUrl url = job->url;
                 QString localFile;
                 QQuickImageProvider::ImageType imageType = QQuickImageProvider::Invalid;
-                QQuickImageProvider *provider = 0;
+                QQuickImageProvider *provider = nullptr;
 
                 if (url.scheme() == QLatin1String("image")) {
                     provider = static_cast<QQuickImageProvider *>(engine->imageProvider(imageProviderId(url)));
@@ -695,7 +695,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u
             QString errorStr = QQuickPixmap::tr("Invalid image provider: %1").arg(url.toString());
             mutex.lock();
             if (!cancelled.contains(runningJob))
-                runningJob->postReply(QQuickPixmapReply::Loading, errorStr, readSize, 0);
+                runningJob->postReply(QQuickPixmapReply::Loading, errorStr, readSize, nullptr);
             mutex.unlock();
             return;
         }
@@ -884,7 +884,7 @@ void QQuickPixmapReader::cancel(QQuickPixmapReply *reply)
     mutex.lock();
     if (reply->loading) {
         cancelled.append(reply);
-        reply->data = 0;
+        reply->data = nullptr;
         // XXX
         if (threadObject) threadObject->processJobs();
     } else {
@@ -918,7 +918,7 @@ void QQuickPixmapReader::run()
     exec();
 
     delete threadObject;
-    threadObject = 0;
+    threadObject = nullptr;
 }
 
 class QQuickPixmapKey
@@ -971,7 +971,7 @@ Q_GLOBAL_STATIC(QQuickPixmapStore, pixmapStore);
 
 
 QQuickPixmapStore::QQuickPixmapStore()
-    : m_unreferencedPixmaps(0), m_lastUnreferencedPixmap(0), m_unreferencedCost(0), m_timerId(-1), m_destroying(false)
+    : m_unreferencedPixmaps(nullptr), m_lastUnreferencedPixmap(nullptr), m_unreferencedCost(0), m_timerId(-1), m_destroying(false)
 {
 }
 
@@ -1014,9 +1014,9 @@ QQuickPixmapStore::~QQuickPixmapStore()
 
 void QQuickPixmapStore::unreferencePixmap(QQuickPixmapData *data)
 {
-    Q_ASSERT(data->prevUnreferenced == 0);
-    Q_ASSERT(data->prevUnreferencedPtr == 0);
-    Q_ASSERT(data->nextUnreferenced == 0);
+    Q_ASSERT(data->prevUnreferenced == nullptr);
+    Q_ASSERT(data->prevUnreferencedPtr == nullptr);
+    Q_ASSERT(data->nextUnreferenced == nullptr);
 
     data->nextUnreferenced = m_unreferencedPixmaps;
     data->prevUnreferencedPtr = &m_unreferencedPixmaps;
@@ -1052,9 +1052,9 @@ void QQuickPixmapStore::referencePixmap(QQuickPixmapData *data)
     if (m_lastUnreferencedPixmap == data)
         m_lastUnreferencedPixmap = data->prevUnreferenced;
 
-    data->nextUnreferenced = 0;
-    data->prevUnreferencedPtr = 0;
-    data->prevUnreferenced = 0;
+    data->nextUnreferenced = nullptr;
+    data->prevUnreferencedPtr = nullptr;
+    data->prevUnreferenced = nullptr;
 
     m_unreferencedCost -= data->cost();
 }
@@ -1063,12 +1063,12 @@ void QQuickPixmapStore::shrinkCache(int remove)
 {
     while ((remove > 0 || m_unreferencedCost > cache_limit) && m_lastUnreferencedPixmap) {
         QQuickPixmapData *data = m_lastUnreferencedPixmap;
-        Q_ASSERT(data->nextUnreferenced == 0);
+        Q_ASSERT(data->nextUnreferenced == nullptr);
 
-        *data->prevUnreferencedPtr = 0;
+        *data->prevUnreferencedPtr = nullptr;
         m_lastUnreferencedPixmap = data->prevUnreferenced;
-        data->prevUnreferencedPtr = 0;
-        data->prevUnreferenced = 0;
+        data->prevUnreferencedPtr = nullptr;
+        data->prevUnreferenced = nullptr;
 
         if (!m_destroying) {
             remove -= data->cost();
@@ -1085,7 +1085,7 @@ void QQuickPixmapStore::timerEvent(QTimerEvent *)
 
     shrinkCache(removalCost);
 
-    if (m_unreferencedPixmaps == 0) {
+    if (m_unreferencedPixmaps == nullptr) {
         killTimer(m_timerId);
         m_timerId = -1;
     }
@@ -1102,7 +1102,7 @@ void QQuickPixmap::purgeCache()
 }
 
 QQuickPixmapReply::QQuickPixmapReply(QQuickPixmapData *d)
-: data(d), engineForReader(0), requestSize(d->requestSize), url(d->url), loading(false), providerOptions(d->providerOptions), redirectCount(0)
+: data(d), engineForReader(nullptr), requestSize(d->requestSize), url(d->url), loading(false), providerOptions(d->providerOptions), redirectCount(0)
 {
     if (finishedIndex == -1) {
         finishedIndex = QMetaMethod::fromSignal(&QQuickPixmapReply::finished).methodIndex();
@@ -1125,10 +1125,10 @@ bool QQuickPixmapReply::event(QEvent *event)
             data->pixmapStatus = (de->error == NoError) ? QQuickPixmap::Ready : QQuickPixmap::Error;
             if (data->pixmapStatus == QQuickPixmap::Ready) {
                 data->textureFactory = de->textureFactory;
-                de->textureFactory = 0;
+                de->textureFactory = nullptr;
                 data->implicitSize = de->implicitSize;
                 PIXMAP_PROFILE(pixmapLoadingFinished(data->url,
-                        data->textureFactory != 0 && data->textureFactory->textureSize().isValid() ?
+                        data->textureFactory != nullptr && data->textureFactory->textureSize().isValid() ?
                         data->textureFactory->textureSize() :
                         (data->requestSize.isValid() ? data->requestSize : data->implicitSize)));
             } else {
@@ -1137,7 +1137,7 @@ bool QQuickPixmapReply::event(QEvent *event)
                 data->removeFromCache(); // We don't continue to cache error'd pixmaps
             }
 
-            data->reply = 0;
+            data->reply = nullptr;
             emit finished();
         } else {
             PIXMAP_PROFILE(pixmapStateChanged<QQuickProfiler::PixmapLoadingError>(url));
@@ -1173,8 +1173,8 @@ void QQuickPixmapData::release()
     if (refCount == 0) {
         if (reply) {
             QQuickPixmapReply *cancelReply = reply;
-            reply->data = 0;
-            reply = 0;
+            reply->data = nullptr;
+            reply = nullptr;
             QQuickPixmapReader::readerMutex.lock();
             QQuickPixmapReader *reader = QQuickPixmapReader::existingInstance(cancelReply->engineForReader);
             if (reader)
@@ -1276,7 +1276,7 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q
 
     QString localFile = QQmlFile::urlToLocalFileOrQrc(url);
     if (localFile.isEmpty())
-        return 0;
+        return nullptr;
 
     QFile f(existingImageFileForPath(localFile));
     QSize readSize;
@@ -1318,18 +1318,18 @@ struct QQuickPixmapNull {
 Q_GLOBAL_STATIC(QQuickPixmapNull, nullPixmap);
 
 QQuickPixmap::QQuickPixmap()
-: d(0)
+: d(nullptr)
 {
 }
 
 QQuickPixmap::QQuickPixmap(QQmlEngine *engine, const QUrl &url)
-: d(0)
+: d(nullptr)
 {
     load(engine, url);
 }
 
 QQuickPixmap::QQuickPixmap(QQmlEngine *engine, const QUrl &url, const QSize &size)
-: d(0)
+: d(nullptr)
 {
     load(engine, url, size);
 }
@@ -1345,13 +1345,13 @@ QQuickPixmap::~QQuickPixmap()
     if (d) {
         d->declarativePixmaps.remove(this);
         d->release();
-        d = 0;
+        d = nullptr;
     }
 }
 
 bool QQuickPixmap::isNull() const
 {
-    return d == 0;
+    return d == nullptr;
 }
 
 bool QQuickPixmap::isReady() const
@@ -1422,7 +1422,7 @@ QQuickTextureFactory *QQuickPixmap::textureFactory() const
     if (d)
         return d->textureFactory;
 
-    return 0;
+    return nullptr;
 }
 
 QImage QQuickPixmap::image() const
@@ -1500,7 +1500,7 @@ void QQuickPixmap::load(QQmlEngine *engine, const QUrl &url, const QSize &reques
     if (d) {
         d->declarativePixmaps.remove(this);
         d->release();
-        d = 0;
+        d = nullptr;
     }
 
     QQuickPixmapKey key = { &url, &requestSize, providerOptions };
@@ -1572,7 +1572,7 @@ void QQuickPixmap::clear()
     if (d) {
         d->declarativePixmaps.remove(this);
         d->release();
-        d = 0;
+        d = nullptr;
     }
 }
 
@@ -1580,10 +1580,10 @@ void QQuickPixmap::clear(QObject *obj)
 {
     if (d) {
         if (d->reply)
-            QObject::disconnect(d->reply, 0, obj, 0);
+            QObject::disconnect(d->reply, nullptr, obj, nullptr);
         d->declarativePixmaps.remove(this);
         d->release();
-        d = 0;
+        d = nullptr;
     }
 }
 
diff --git a/src/quick/util/qquickprofiler.cpp b/src/quick/util/qquickprofiler.cpp
index 402cd44ff0..bd9f04e562 100644
--- a/src/quick/util/qquickprofiler.cpp
+++ b/src/quick/util/qquickprofiler.cpp
@@ -47,12 +47,12 @@
 QT_BEGIN_NAMESPACE
 
 // instance will be set, unset in constructor. Allows static methods to be inlined.
-QQuickProfiler *QQuickProfiler::s_instance = 0;
+QQuickProfiler *QQuickProfiler::s_instance = nullptr;
 quint64 QQuickProfiler::featuresEnabled = 0;
 
 void QQuickProfiler::initialize(QObject *parent)
 {
-    Q_ASSERT(s_instance == 0);
+    Q_ASSERT(s_instance == nullptr);
     s_instance = new QQuickProfiler(parent);
 }
 
@@ -99,7 +99,7 @@ QQuickProfiler::~QQuickProfiler()
 {
     QMutexLocker lock(&m_dataMutex);
     featuresEnabled = 0;
-    s_instance = 0;
+    s_instance = nullptr;
 }
 
 void QQuickProfiler::startProfilingImpl(quint64 features)
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index c585d4c16d..f79dbf35a0 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -459,7 +459,7 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions()
 
             QQmlContextData *context = QQmlContextData::get(qmlContext(this));
 
-            QQmlBinding *newBinding = 0;
+            QQmlBinding *newBinding = nullptr;
             if (e.id != QQmlBinding::Invalid) {
                 QV4::Scope scope(qmlEngine(this)->handle());
                 QV4::Scoped<QV4::QmlContext> qmlContext(scope, QV4::QmlContext::create(scope.engine->rootContext(), context, object()));
diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h
index 2f0e3bc0d8..7bceba387c 100644
--- a/src/quick/util/qquicksmoothedanimation_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p.h
@@ -73,7 +73,7 @@ public:
     enum ReversingMode { Eased, Immediate, Sync };
     Q_ENUM(ReversingMode)
 
-    QQuickSmoothedAnimation(QObject *parent = 0);
+    QQuickSmoothedAnimation(QObject *parent = nullptr);
     ~QQuickSmoothedAnimation();
 
     ReversingMode reversingMode() const;
@@ -91,7 +91,7 @@ public:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 Q_SIGNALS:
     void velocityChanged();
     void reversingModeChanged();
diff --git a/src/quick/util/qquicksmoothedanimation_p_p.h b/src/quick/util/qquicksmoothedanimation_p_p.h
index a415fdb55f..7850562594 100644
--- a/src/quick/util/qquicksmoothedanimation_p_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p_p.h
@@ -65,7 +65,7 @@ class QSmoothedAnimationTimer : public QTimer
 {
     Q_OBJECT
 public:
-    explicit QSmoothedAnimationTimer(QSmoothedAnimation *animation, QObject *parent = 0);
+    explicit QSmoothedAnimationTimer(QSmoothedAnimation *animation, QObject *parent = nullptr);
     ~QSmoothedAnimationTimer();
 public Q_SLOTS:
     void stopAnimation();
@@ -78,7 +78,7 @@ class Q_AUTOTEST_EXPORT QSmoothedAnimation : public QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QSmoothedAnimation)
 public:
-    QSmoothedAnimation(QQuickSmoothedAnimationPrivate * = 0);
+    QSmoothedAnimation(QQuickSmoothedAnimationPrivate * = nullptr);
 
     ~QSmoothedAnimation();
     qreal to;
@@ -98,7 +98,7 @@ public:
     void init();
 
     void prepareForRestart();
-    void clearTemplate() { animationTemplate = 0; }
+    void clearTemplate() { animationTemplate = nullptr; }
 
 protected:
     void updateCurrentTime(int) override;
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index bf844589ba..4389d941fd 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -58,7 +58,7 @@ class Q_AUTOTEST_EXPORT QSpringAnimation : public QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QSpringAnimation)
 public:
-    QSpringAnimation(QQuickSpringAnimationPrivate * = 0);
+    QSpringAnimation(QQuickSpringAnimationPrivate * = nullptr);
 
     ~QSpringAnimation();
     int duration() const override;
@@ -94,7 +94,7 @@ public:
     typedef QHash<QQmlProperty, QSpringAnimation*> ActiveAnimationHash;
     typedef ActiveAnimationHash::Iterator ActiveAnimationHashIt;
 
-    void clearTemplate() { animationTemplate = 0; }
+    void clearTemplate() { animationTemplate = nullptr; }
 
 protected:
     void updateCurrentTime(int time) override;
diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h
index ffb2c41e6b..2014a4311a 100644
--- a/src/quick/util/qquickspringanimation_p.h
+++ b/src/quick/util/qquickspringanimation_p.h
@@ -73,7 +73,7 @@ class Q_AUTOTEST_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation
     Q_PROPERTY(qreal mass READ mass WRITE setMass NOTIFY massChanged)
 
 public:
-    QQuickSpringAnimation(QObject *parent=0);
+    QQuickSpringAnimation(QObject *parent=nullptr);
     ~QQuickSpringAnimation();
 
     qreal velocity() const;
@@ -97,7 +97,7 @@ public:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0) override;
+                            QObject *defaultTarget = nullptr) override;
 
 Q_SIGNALS:
     void modulusChanged();
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 3e0a2169a8..be8300f531 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
 QQuickStateAction::QQuickStateAction()
-: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(0), event(0),
-  specifiedObject(0)
+: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(nullptr), event(nullptr),
+  specifiedObject(nullptr)
 {
 }
 
@@ -61,7 +61,7 @@ QQuickStateAction::QQuickStateAction(QObject *target, const QString &propertyNam
                const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false),
   property(target, propertyName, qmlEngine(target)), toValue(value),
-  fromBinding(0), event(0),
+  fromBinding(nullptr), event(nullptr),
   specifiedObject(target), specifiedProperty(propertyName)
 {
     if (property.isValid())
@@ -71,7 +71,7 @@ QQuickStateAction::QQuickStateAction(QObject *target, const QString &propertyNam
 QQuickStateAction::QQuickStateAction(QObject *target, const QQmlProperty &property, const QString &propertyName, const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false),
   property(property), toValue(value),
-  fromBinding(0), event(0),
+  fromBinding(nullptr), event(nullptr),
   specifiedObject(target), specifiedProperty(propertyName)
 {
     if (property.isValid())
@@ -192,7 +192,7 @@ bool QQuickState::isNamed() const
 bool QQuickState::isWhenKnown() const
 {
     Q_D(const QQuickState);
-    return d->when != 0;
+    return d->when != nullptr;
 }
 
 /*!
@@ -362,7 +362,7 @@ void QQuickStateAction::deleteFromBinding()
 {
     if (fromBinding) {
         QQmlPropertyPrivate::removeBinding(property);
-        fromBinding = 0;
+        fromBinding = nullptr;
     }
 }
 
@@ -530,7 +530,7 @@ QQmlAbstractBinding *QQuickState::bindingInRevertList(QObject *target, const QSt
         }
     }
 
-    return 0;
+    return nullptr;
 }
 
 bool QQuickState::isStateActive() const
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
index f551402e80..89af5882df 100644
--- a/src/quick/util/qquickstate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -126,7 +126,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStateOperation : public QObject
 {
     Q_OBJECT
 public:
-    QQuickStateOperation(QObject *parent = 0)
+    QQuickStateOperation(QObject *parent = nullptr)
         : QObject(parent) {}
     typedef QList<QQuickStateAction> ActionList;
 
@@ -136,7 +136,7 @@ public:
     void setState(QQuickState *state);
 
 protected:
-    QQuickStateOperation(QObjectPrivate &dd, QObject *parent = 0);
+    QQuickStateOperation(QObjectPrivate &dd, QObject *parent = nullptr);
 
 private:
     Q_DECLARE_PRIVATE(QQuickStateOperation)
@@ -159,7 +159,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickState : public QObject
     Q_CLASSINFO("DeferredPropertyNames", "changes")
 
 public:
-    QQuickState(QObject *parent=0);
+    QQuickState(QObject *parent=nullptr);
     virtual ~QQuickState();
 
     QString name() const;
diff --git a/src/quick/util/qquickstate_p_p.h b/src/quick/util/qquickstate_p_p.h
index eba1dabecf..f1bc24c558 100644
--- a/src/quick/util/qquickstate_p_p.h
+++ b/src/quick/util/qquickstate_p_p.h
@@ -178,8 +178,8 @@ private:
 class QQuickRevertAction
 {
 public:
-    QQuickRevertAction() : event(0) {}
-    QQuickRevertAction(const QQmlProperty &prop) : property(prop), event(0) {}
+    QQuickRevertAction() : event(nullptr) {}
+    QQuickRevertAction(const QQmlProperty &prop) : property(prop), event(nullptr) {}
     QQuickRevertAction(QQuickStateActionEvent *e) : event(e) {}
     QQmlProperty property;
     QQuickStateActionEvent *event;
@@ -192,7 +192,7 @@ class QQuickStateOperationPrivate : public QObjectPrivate
 public:
 
     QQuickStateOperationPrivate()
-    : m_state(0) {}
+    : m_state(nullptr) {}
 
     QQuickState *m_state;
 };
@@ -203,7 +203,7 @@ class QQuickStatePrivate : public QObjectPrivate
 
 public:
     QQuickStatePrivate()
-    : when(0), named(false), inState(false), group(0) {}
+    : when(nullptr), named(false), inState(false), group(nullptr) {}
 
     typedef QList<QQuickSimpleAction> SimpleActionList;
 
@@ -233,7 +233,7 @@ public:
         QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
         QMutableListIterator<OperationGuard> listIterator(*list);
         while(listIterator.hasNext())
-            listIterator.next()->setState(0);
+            listIterator.next()->setState(nullptr);
         list->clear();
     }
     static int operations_count(QQmlListProperty<QQuickStateOperation> *prop) {
diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h
index a1315ae2ef..ff509a7cf5 100644
--- a/src/quick/util/qquickstatechangescript_p.h
+++ b/src/quick/util/qquickstatechangescript_p.h
@@ -66,7 +66,7 @@ class Q_AUTOTEST_EXPORT QQuickStateChangeScript : public QQuickStateOperation, p
     Q_PROPERTY(QString name READ name WRITE setName)
 
 public:
-    QQuickStateChangeScript(QObject *parent=0);
+    QQuickStateChangeScript(QObject *parent=nullptr);
     ~QQuickStateChangeScript();
 
     ActionList actions() override;
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index ebcbbf93ed..1b99baed9a 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -60,7 +60,7 @@ class QQuickStateGroupPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickStateGroup)
 public:
     QQuickStateGroupPrivate()
-    : nullState(0), componentComplete(true),
+    : nullState(nullptr), componentComplete(true),
       ignoreTrans(false), applyingState(false), unnamedCount(0) {}
 
     QString currentState;
@@ -129,7 +129,7 @@ QQuickStateGroup::~QQuickStateGroup()
 {
     Q_D(const QQuickStateGroup);
     for (int i = 0; i < d->states.count(); ++i)
-        d->states.at(i)->setStateGroup(0);
+        d->states.at(i)->setStateGroup(nullptr);
 }
 
 QList<QQuickState *> QQuickStateGroup::states() const
@@ -194,7 +194,7 @@ void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list)
     QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     _this->d_func()->setCurrentStateInternal(QString(), true);
     for (int i = 0; i < _this->d_func()->states.count(); ++i) {
-        _this->d_func()->states.at(i)->setStateGroup(0);
+        _this->d_func()->states.at(i)->setStateGroup(nullptr);
     }
     _this->d_func()->states.clear();
 }
@@ -364,7 +364,7 @@ bool QQuickStateGroupPrivate::updateAutoState()
 
 QQuickTransition *QQuickStateGroupPrivate::findTransition(const QString &from, const QString &to)
 {
-    QQuickTransition *highest = 0;
+    QQuickTransition *highest = nullptr;
     int score = 0;
     bool reversed = false;
     bool done = false;
@@ -444,7 +444,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
 
     applyingState = true;
 
-    QQuickTransition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
+    QQuickTransition *transition = ignoreTrans ? nullptr : findTransition(currentState, state);
     if (stateChangeDebug()) {
         qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
         if (transition)
@@ -452,7 +452,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
                        << transition->toState();
     }
 
-    QQuickState *oldState = 0;
+    QQuickState *oldState = nullptr;
     if (!currentState.isEmpty()) {
         for (int ii = 0; ii < states.count(); ++ii) {
             if (states.at(ii)->name() == currentState) {
@@ -465,7 +465,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
     currentState = state;
     emit q->stateChanged(currentState);
 
-    QQuickState *newState = 0;
+    QQuickState *newState = nullptr;
     for (int ii = 0; ii < states.count(); ++ii) {
         if (states.at(ii)->name() == currentState) {
             newState = states.at(ii);
@@ -473,7 +473,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
         }
     }
 
-    if (oldState == 0 || newState == 0) {
+    if (oldState == nullptr || newState == nullptr) {
         if (!nullState) {
             nullState = new QQuickState;
             QQml_setParent_noEvent(nullState, q);
@@ -496,7 +496,7 @@ QQuickState *QQuickStateGroup::findState(const QString &name) const
             return state;
     }
 
-    return 0;
+    return nullptr;
 }
 
 void QQuickStateGroup::removeState(QQuickState *state)
diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h
index eebe3a9e56..7235066d99 100644
--- a/src/quick/util/qquickstategroup_p.h
+++ b/src/quick/util/qquickstategroup_p.h
@@ -67,7 +67,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStateGroup : public QObject, public QQmlParse
     Q_PROPERTY(QQmlListProperty<QQuickTransition> transitions READ transitionsProperty DESIGNABLE false)
 
 public:
-    QQuickStateGroup(QObject * = 0);
+    QQuickStateGroup(QObject * = nullptr);
     virtual ~QQuickStateGroup();
 
     QString state() const;
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index ae8719341d..762d49f2d2 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -695,7 +695,7 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri
                     image->size = image->pix->implicitSize();
                 } else {
                     delete image->pix;
-                    image->pix = 0;
+                    image->pix = nullptr;
                 }
             }
         }
diff --git a/src/quick/util/qquickstyledtext_p.h b/src/quick/util/qquickstyledtext_p.h
index 2a2e234224..821f95b6bf 100644
--- a/src/quick/util/qquickstyledtext_p.h
+++ b/src/quick/util/qquickstyledtext_p.h
@@ -68,7 +68,7 @@ class Q_AUTOTEST_EXPORT QQuickStyledTextImgTag
 {
 public:
     QQuickStyledTextImgTag()
-        : position(0), offset(0.0), align(QQuickStyledTextImgTag::Bottom), pix(0)
+        : position(0), offset(0.0), align(QQuickStyledTextImgTag::Bottom), pix(nullptr)
     { }
 
     ~QQuickStyledTextImgTag() { delete pix; }
diff --git a/src/quick/util/qquicksvgparser.cpp b/src/quick/util/qquicksvgparser.cpp
index 086c6d0b28..2bf9c121d3 100644
--- a/src/quick/util/qquicksvgparser.cpp
+++ b/src/quick/util/qquicksvgparser.cpp
@@ -126,7 +126,7 @@ static qreal toDouble(const QChar *&str)
             val = -val;
     } else {
         bool ok = false;
-        val = qstrtod(temp, 0, &ok);
+        val = qstrtod(temp, nullptr, &ok);
     }
     return val;
 
diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h
index 086fb31993..9a3a520ed1 100644
--- a/src/quick/util/qquicksystempalette_p.h
+++ b/src/quick/util/qquicksystempalette_p.h
@@ -81,7 +81,7 @@ class Q_AUTOTEST_EXPORT QQuickSystemPalette : public QObject
     Q_PROPERTY(QColor highlightedText READ highlightedText NOTIFY paletteChanged)
 
 public:
-    QQuickSystemPalette(QObject *parent=0);
+    QQuickSystemPalette(QObject *parent=nullptr);
     ~QQuickSystemPalette();
 
     enum ColorGroup { Active = QPalette::Active, Inactive = QPalette::Inactive, Disabled = QPalette::Disabled };
diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp
index 1f4ac08d4d..93284c0685 100644
--- a/src/quick/util/qquicktimeline.cpp
+++ b/src/quick/util/qquicktimeline.cpp
@@ -57,7 +57,7 @@ struct Update {
     Update(QQuickTimeLineValue *_g, qreal _v)
         : g(_g), v(_v) {}
     Update(const QQuickTimeLineCallback &_e)
-        : g(0), v(0), e(_e) {}
+        : g(nullptr), v(0), e(_e) {}
 
     QQuickTimeLineValue *g;
     qreal v;
@@ -133,7 +133,7 @@ struct QQuickTimeLinePrivate
 };
 
 QQuickTimeLinePrivate::QQuickTimeLinePrivate(QQuickTimeLine *parent)
-: length(0), syncPoint(0), q(parent), clockRunning(false), prevTime(0), order(0), syncMode(QQuickTimeLine::LocalSync), syncAdj(0), updateQueue(0)
+: length(0), syncPoint(0), q(parent), clockRunning(false), prevTime(0), order(0), syncMode(QQuickTimeLine::LocalSync), syncAdj(0), updateQueue(nullptr)
 {
 }
 
@@ -326,9 +326,9 @@ QQuickTimeLine::~QQuickTimeLine()
     for (QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
             iter != d->ops.end();
             ++iter)
-        iter.key()->_t = 0;
+        iter.key()->_t = nullptr;
 
-    delete d; d = 0;
+    delete d; d = nullptr;
 }
 
 /*!
@@ -514,7 +514,7 @@ void QQuickTimeLine::reset(QQuickTimeLineValue &timeLineValue)
         return;
     }
     remove(&timeLineValue);
-    timeLineValue._t = 0;
+    timeLineValue._t = nullptr;
 }
 
 int QQuickTimeLine::duration() const
@@ -666,7 +666,7 @@ void QQuickTimeLine::complete()
 void QQuickTimeLine::clear()
 {
     for (QQuickTimeLinePrivate::Ops::const_iterator iter = d->ops.cbegin(), cend  = d->ops.cend(); iter != cend; ++iter)
-        iter.key()->_t = 0;
+        iter.key()->_t = nullptr;
     d->ops.clear();
     d->length = 0;
     d->syncPoint = 0;
@@ -800,7 +800,7 @@ int QQuickTimeLinePrivate::advance(int t)
 
             if (tl.ops.isEmpty()) {
                 iter = ops.erase(iter);
-                v->_t = 0;
+                v->_t = nullptr;
             } else {
                 if (tl.ops.first().type == Op::Pause && pauseTime != 0) {
                     int opPauseTime = tl.ops.first().length - tl.consumedOpLength;
@@ -826,7 +826,7 @@ int QQuickTimeLinePrivate::advance(int t)
                 v.e.d0(v.e.d1);
             }
         }
-        updateQueue = 0;
+        updateQueue = nullptr;
     } while(t);
 
     return pauseTime;
@@ -913,7 +913,7 @@ void QQuickTimeLine::remove(QQuickTimeLineObject *v)
 
 
 QQuickTimeLineObject::QQuickTimeLineObject()
-: _t(0)
+: _t(nullptr)
 {
 }
 
@@ -921,12 +921,12 @@ QQuickTimeLineObject::~QQuickTimeLineObject()
 {
     if (_t) {
         _t->remove(this);
-        _t = 0;
+        _t = nullptr;
     }
 }
 
 QQuickTimeLineCallback::QQuickTimeLineCallback()
-: d0(0), d1(0), d2(0)
+: d0(nullptr), d1(nullptr), d2(nullptr)
 {
 }
 
diff --git a/src/quick/util/qquicktimeline_p_p.h b/src/quick/util/qquicktimeline_p_p.h
index ae1087487b..abb5369b7b 100644
--- a/src/quick/util/qquicktimeline_p_p.h
+++ b/src/quick/util/qquicktimeline_p_p.h
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT QQuickTimeLine : public QObject, QAbstractAnimationJob
 {
 Q_OBJECT
 public:
-    QQuickTimeLine(QObject *parent = 0);
+    QQuickTimeLine(QObject *parent = nullptr);
     ~QQuickTimeLine();
 
     enum SyncMode { LocalSync, GlobalSync };
@@ -152,7 +152,7 @@ public:
     typedef void (*Callback)(void *);
 
     QQuickTimeLineCallback();
-    QQuickTimeLineCallback(QQuickTimeLineObject *b, Callback, void * = 0);
+    QQuickTimeLineCallback(QQuickTimeLineObject *b, Callback, void * = nullptr);
     QQuickTimeLineCallback(const QQuickTimeLineCallback &o);
 
     QQuickTimeLineCallback &operator=(const QQuickTimeLineCallback &o);
@@ -170,7 +170,7 @@ class QQuickTimeLineValueProxy : public QQuickTimeLineValue
 {
 public:
     QQuickTimeLineValueProxy(T *cls, void (T::*func)(qreal), qreal v = 0.)
-    : QQuickTimeLineValue(v), _class(cls), _setFunctionReal(func), _setFunctionInt(0)
+    : QQuickTimeLineValue(v), _class(cls), _setFunctionReal(func), _setFunctionInt(nullptr)
     {
         Q_ASSERT(_class);
     }
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 6ae89c4ed4..fd6415dffb 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -263,7 +263,7 @@ QQuickTransitionInstance *QQuickTransition::prepare(QQuickStateOperation::Action
     int start = d->reversed ? d->animations.count() - 1 : 0;
     int end = d->reversed ? -1 : d->animations.count();
 
-    QAbstractAnimationJob *anim = 0;
+    QAbstractAnimationJob *anim = nullptr;
     for (int i = start; i != end;) {
         anim = d->animations.at(i)->transition(actions, after, direction, defaultTarget);
         if (anim) {
diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h
index 6d2e41fc9d..c7d06b8832 100644
--- a/src/quick/util/qquicktransition_p.h
+++ b/src/quick/util/qquicktransition_p.h
@@ -105,7 +105,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTransition : public QObject
     Q_CLASSINFO("DeferredPropertyNames", "animations")
 
 public:
-    QQuickTransition(QObject *parent=0);
+    QQuickTransition(QObject *parent=nullptr);
     ~QQuickTransition();
 
     QString fromState() const;
diff --git a/src/quick/util/qquicktransitionmanager.cpp b/src/quick/util/qquicktransitionmanager.cpp
index 714e6d62b6..a1367249c6 100644
--- a/src/quick/util/qquicktransitionmanager.cpp
+++ b/src/quick/util/qquicktransitionmanager.cpp
@@ -56,7 +56,7 @@ class QQuickTransitionManagerPrivate
 {
 public:
     QQuickTransitionManagerPrivate()
-        : state(0), transitionInstance(0) {}
+        : state(nullptr), transitionInstance(nullptr) {}
 
     void applyBindings();
     typedef QList<QQuickSimpleAction> SimpleActionList;
@@ -79,7 +79,7 @@ void QQuickTransitionManager::setState(QQuickState *s)
 QQuickTransitionManager::~QQuickTransitionManager()
 {
     delete d->transitionInstance;
-    delete d; d = 0;
+    delete d; d = nullptr;
 }
 
 bool QQuickTransitionManager::isRunning() const
@@ -274,7 +274,7 @@ void QQuickTransitionManager::cancel()
         QQuickStateAction action = d->bindingsList[i];
         if (action.toBinding && action.deletableToBinding) {
             QQmlPropertyPrivate::removeBinding(action.property);
-            action.toBinding = 0;
+            action.toBinding = nullptr;
             action.deletableToBinding = false;
         } else if (action.event) {
             //### what do we do here?
diff --git a/src/quick/util/qquicktransitionmanager_p_p.h b/src/quick/util/qquicktransitionmanager_p_p.h
index 68daf6db3c..89317e1e07 100644
--- a/src/quick/util/qquicktransitionmanager_p_p.h
+++ b/src/quick/util/qquicktransitionmanager_p_p.h
@@ -66,7 +66,7 @@ public:
 
     bool isRunning() const;
 
-    void transition(const QList<QQuickStateAction> &, QQuickTransition *transition, QObject *defaultTarget = 0);
+    void transition(const QList<QQuickStateAction> &, QQuickTransition *transition, QObject *defaultTarget = nullptr);
 
     void cancel();
 
diff --git a/src/quick/util/qquickvalidator_p.h b/src/quick/util/qquickvalidator_p.h
index ba188e947a..812e552d8e 100644
--- a/src/quick/util/qquickvalidator_p.h
+++ b/src/quick/util/qquickvalidator_p.h
@@ -62,7 +62,7 @@ class Q_AUTOTEST_EXPORT QQuickIntValidator : public QIntValidator
     Q_OBJECT
     Q_PROPERTY(QString locale READ localeName WRITE setLocaleName RESET resetLocaleName NOTIFY localeNameChanged)
 public:
-    QQuickIntValidator(QObject *parent = 0);
+    QQuickIntValidator(QObject *parent = nullptr);
 
     QString localeName() const;
     void setLocaleName(const QString &name);
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QQuickDoubleValidator : public QDoubleValidator
     Q_OBJECT
     Q_PROPERTY(QString locale READ localeName WRITE setLocaleName RESET resetLocaleName NOTIFY localeNameChanged)
 public:
-    QQuickDoubleValidator(QObject *parent = 0);
+    QQuickDoubleValidator(QObject *parent = nullptr);
 
     QString localeName() const;
     void setLocaleName(const QString &name);
author	Shawn Rutledge <shawn.rutledge@qt.io>	2018-02-21 10:41:54 +0100
committer	Shawn Rutledge <shawn.rutledge@qt.io>	2018-02-26 07:13:18 +0000
commit	499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree	206c90d47387f8322b68f5e3db613189397e1af3 /src/quick
parent	53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)