diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-17 07:50:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-17 07:50:35 +0000 |
| commit | 957114bd4d8fa17dfedd1317be01842128f9bbdc (patch) | |
| tree | 01ea72034ffd97fa7f7480405b35b1ee727a8aba /src/render/texture/qtextureimage.h | |
| parent | 75ecffadd162267645a8c63a928af56b980eac52 (diff) | |
| parent | c38ba06bbc139b1d070bf279bc9e05384ece1e87 (diff) | |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/render/texture/qtextureimage.h')
| -rw-r--r-- | src/render/texture/qtextureimage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index c678d25f5..a2b96e92d 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: - explicit QTextureImage(Qt3DCore::QNode *parent = 0); + explicit QTextureImage(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureImage(); enum Status { |