Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 924d332452..1a1b2d76e2 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -690,12 +690,12 @@ int QKdPointTree::build(int begin, int end, int depth)
     if (last > begin)
         m_nodes.at(last).left = &m_nodes.at(build(begin, last, depth + 1));
     else
-        m_nodes.at(last).left = 0;
+        m_nodes.at(last).left = nullptr;
 
     if (last + 1 < end)
         m_nodes.at(last).right = &m_nodes.at(build(last + 1, end, depth + 1));
     else
-        m_nodes.at(last).right = 0;
+        m_nodes.at(last).right = nullptr;
 
     return last;
 }
@@ -811,7 +811,7 @@ void QWingedEdge::intersectAndAdd()
             if (isect->next) {
                 isect += isect->next;
             } else {
-                isect = 0;
+                isect = nullptr;
             }
         }
 
@@ -1535,8 +1535,8 @@ QPainterPath QPathClipper::clip(Operation operation)
         if (subjectPath == clipPath)
             return op == BoolSub ? QPainterPath() : subjectPath;
 
-        bool subjectIsRect = pathToRect(subjectPath, 0);
-        bool clipIsRect = pathToRect(clipPath, 0);
+        bool subjectIsRect = pathToRect(subjectPath, nullptr);
+        bool clipIsRect = pathToRect(clipPath, nullptr);
 
         const QRectF clipBounds = clipPath.boundingRect();
         const QRectF subjectBounds = subjectPath.boundingRect();