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/qsvgrenderer.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/qsvgrenderer.h')
-rw-r--r-- | src/svg/qsvgrenderer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index fe58343..6538df0 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -65,10 +65,10 @@ class Q_SVG_EXPORT QSvgRenderer : public QObject Q_PROPERTY(int framesPerSecond READ framesPerSecond WRITE setFramesPerSecond) Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame) public: - QSvgRenderer(QObject *parent=0); - QSvgRenderer(const QString &filename, QObject *parent=0); - QSvgRenderer(const QByteArray &contents, QObject *parent=0); - QSvgRenderer(QXmlStreamReader *contents, QObject *parent=0); + QSvgRenderer(QObject *parent = Q_NULLPTR); + QSvgRenderer(const QString &filename, QObject *parent = Q_NULLPTR); + QSvgRenderer(const QByteArray &contents, QObject *parent = Q_NULLPTR); + QSvgRenderer(QXmlStreamReader *contents, QObject *parent = Q_NULLPTR); ~QSvgRenderer(); bool isValid() const; |