summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qmesh.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-01 02:13:35 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-01 19:26:22 +0000
commit792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (patch)
tree08002bd7d4ab4ce8e15604d7729b5721addf22df /src/render/geometry/qmesh.h
parent7e4b3673ac571ce067e36e29d63f1fd4418bcfb7 (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/geometry/qmesh.h')
-rw-r--r--src/render/geometry/qmesh.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index 58985789a..072ad2dd2 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
Q_PROPERTY(QString subMesh READ subMesh WRITE setSubMesh NOTIFY subMeshChanged)
public:
- explicit QMesh(Qt3DCore::QNode *parent = 0);
+ explicit QMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
~QMesh();
QUrl source() const;
@@ -73,7 +73,7 @@ Q_SIGNALS:
void subMeshChanged(const QString &subMesh);
protected:
- QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0);
+ QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QMesh)