diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 02:13:35 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 19:26:22 +0000 |
| commit | 792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (patch) | |
| tree | 08002bd7d4ab4ce8e15604d7729b5721addf22df /src/render/defaults/qdiffusemapmaterial.h | |
| parent | 7e4b3673ac571ce067e36e29d63f1fd4418bcfb7 (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
Task-number: QTBUG-45291
Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusemapmaterial.h')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index 5367abe9d..8725b89a6 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseMapMaterial(); QColor ambient() const; |