diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
commit | 8427634773505f73ce030cf68761c4719eb03e5c (patch) | |
tree | 56d0e488e533778782b55c54aa3ab07f0d5e888d /src/datavisualization/data/qcustom3dvolume.h | |
parent | 3fb7ce6a29ca69237c777cc65a3831768e938782 (diff) | |
parent | 364ed207af1becd2b85d93bc87d5db84624b4381 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
Diffstat (limited to 'src/datavisualization/data/qcustom3dvolume.h')
-rw-r--r-- | src/datavisualization/data/qcustom3dvolume.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index 9498c7eb..bd2fe7f4 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -62,12 +62,12 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem public: - explicit QCustom3DVolume(QObject *parent = 0); + explicit QCustom3DVolume(QObject *parent = Q_NULLPTR); explicit QCustom3DVolume(const QVector3D &position, const QVector3D &scaling, const QQuaternion &rotation, int textureWidth, int textureHeight, int textureDepth, QVector<uchar> *textureData, QImage::Format textureFormat, - const QVector<QRgb> &colorTable, QObject *parent = 0); + const QVector<QRgb> &colorTable, QObject *parent = Q_NULLPTR); virtual ~QCustom3DVolume(); void setTextureWidth(int value); |