diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
commit | 13a8c4eb9977a962fd70a91c6e5801f7a6506900 (patch) | |
tree | c7baf2d0bfedcea8e51d996d5a336d29064d73d7 /src/datavisualization/data/qcustom3ditem.h | |
parent | 5ad9e88e1a08efc57739e9ea6d98199b416a4178 (diff) | |
parent | 8427634773505f73ce030cf68761c4719eb03e5c (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I17383a4cdebb3c54489f6f39e1ad7ae136d80971
Diffstat (limited to 'src/datavisualization/data/qcustom3ditem.h')
-rw-r--r-- | src/datavisualization/data/qcustom3ditem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h index cdf54414..3372a766 100644 --- a/src/datavisualization/data/qcustom3ditem.h +++ b/src/datavisualization/data/qcustom3ditem.h @@ -53,10 +53,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION 1) public: - explicit QCustom3DItem(QObject *parent = 0); + explicit QCustom3DItem(QObject *parent = Q_NULLPTR); explicit QCustom3DItem(const QString &meshFile, const QVector3D &position, const QVector3D &scaling, const QQuaternion &rotation, - const QImage &texture, QObject *parent = 0); + const QImage &texture, QObject *parent = Q_NULLPTR); virtual ~QCustom3DItem(); void setMeshFile(const QString &meshFile); @@ -102,7 +102,7 @@ Q_SIGNALS: Q_REVISION(1) void scalingAbsoluteChanged(bool scalingAbsolute); protected: - QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = 0); + QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = Q_NULLPTR); QScopedPointer<QCustom3DItemPrivate> d_ptr; |