diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:57 +0100 |
| commit | 86b82a0eea6c26fba34a9d2049935a18a088f3e7 (patch) | |
| tree | cfb16979ac42ca43d35a0687a77b325510674308 /src/svg/qgraphicssvgitem.h | |
| parent | 4ef60892ce9e8dea75a31b0be7895ebf473346a9 (diff) | |
| parent | a0363376cfbfd9359adbd2501dd087dfb0a4eb98 (diff) | |
| download | qtsvg-86b82a0eea6c26fba34a9d2049935a18a088f3e7.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
Diffstat (limited to 'src/svg/qgraphicssvgitem.h')
| -rw-r--r-- | src/svg/qgraphicssvgitem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 90ae4c5..88603ec 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -61,8 +61,8 @@ class Q_SVG_EXPORT QGraphicsSvgItem : public QGraphicsObject Q_PROPERTY(QSize maximumCacheSize READ maximumCacheSize WRITE setMaximumCacheSize) public: - QGraphicsSvgItem(QGraphicsItem *parentItem=0); - QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem=0); + QGraphicsSvgItem(QGraphicsItem *parentItem = Q_NULLPTR); + QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = Q_NULLPTR); void setSharedRenderer(QSvgRenderer *renderer); QSvgRenderer *renderer() const; @@ -80,7 +80,7 @@ public: virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget=0); + QWidget *widget = Q_NULLPTR); enum { Type = 13 }; virtual int type() const; |