summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qshaderdata_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/materialsystem/qshaderdata_p.h')
-rw-r--r--src/render/materialsystem/qshaderdata_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h
index ae98f0ed8..bbaa3b765 100644
--- a/src/render/materialsystem/qshaderdata_p.h
+++ b/src/render/materialsystem/qshaderdata_p.h
@@ -70,9 +70,9 @@ class QShaderDataPropertyReader: public PropertyReaderInterface
{
QVariant readProperty(const QVariant &v) Q_DECL_OVERRIDE
{
- QShaderData *shaderData = Q_NULLPTR;
+ QShaderData *shaderData = nullptr;
- if (v.userType() == qShaderDataTypeId && (shaderData = v.value<QShaderData *>()) != Q_NULLPTR) {
+ if (v.userType() == qShaderDataTypeId && (shaderData = v.value<QShaderData *>()) != nullptr) {
return QVariant::fromValue(shaderData->id());
} else if (v.userType() == qVectorShaderDataTypeId) {
QVariantList vlist;