Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/widgets/graphicsview/padnavigator/roundrectitem.h b/examples/widgets/graphicsview/padnavigator/roundrectitem.h
index e76862c08c..91b3e6542e 100644
--- a/examples/widgets/graphicsview/padnavigator/roundrectitem.h
+++ b/examples/widgets/graphicsview/padnavigator/roundrectitem.h
@@ -61,13 +61,13 @@ class RoundRectItem : public QGraphicsObject
     Q_PROPERTY(bool fill READ fill WRITE setFill)
 public:
     RoundRectItem(const QRectF &bounds, const QColor &color,
-                  QGraphicsItem *parent = 0);
+                  QGraphicsItem *parent = nullptr);
 
     QPixmap pixmap() const;
     void setPixmap(const QPixmap &pixmap);
 
     QRectF boundingRect() const override;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
 
     bool fill() const;
     void setFill(bool fill);