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 22:14:14 +0000 |
| commit | 1c4cd066aaa4d51d468aa22d139b08ad8a81e484 (patch) | |
| tree | e5edb329a9bddca9076926899209cbdb6e64b0b1 /src/render/framegraph/qrendersurfaceselector.h | |
| parent | 66dba70b569aa26faff962c11050318d4c4517f5 (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
This amends a similar commit on 5.6.
Task-number: QTBUG-45291
Change-Id: I0d76f5c9b95db38f03771acaba1b4a80e4762ec9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/framegraph/qrendersurfaceselector.h')
| -rw-r--r-- | src/render/framegraph/qrendersurfaceselector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h index 602d2f429..165ab11ec 100644 --- a/src/render/framegraph/qrendersurfaceselector.h +++ b/src/render/framegraph/qrendersurfaceselector.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrame Q_PROPERTY(QWindow *window READ window WRITE setWindow NOTIFY windowChanged) public: - explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = 0); + explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = nullptr); ~QRenderSurfaceSelector(); QSurface *surface() const; @@ -75,7 +75,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QRenderSurfaceSelector) - QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent = nullptr); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: |