summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qmaterial
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-29 19:35:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-01 15:43:11 +0000
commita01b14670e5b35a951ec57297613418dc829d65c (patch)
treed9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /tests/auto/render/qmaterial
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/qmaterial')
-rw-r--r--tests/auto/render/qmaterial/tst_qmaterial.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index 71775308c..af02f3180 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -89,7 +89,7 @@ private:
void compareEffects(const Qt3DRender::QEffect *original, const Qt3DRender::QEffect *clone)
{
- bool isEffectNull = (original == Q_NULLPTR);
+ bool isEffectNull = (original == nullptr);
if (isEffectNull) {
QVERIFY(!clone);
} else {
@@ -171,7 +171,7 @@ private:
void compareShaderPrograms(const Qt3DRender::QShaderProgram *original, const Qt3DRender::QShaderProgram *clone)
{
- bool isOriginalNull = (original == Q_NULLPTR);
+ bool isOriginalNull = (original == nullptr);
if (isOriginalNull) {
QVERIFY(!clone);
} else {