diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-29 11:40:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-29 11:40:59 +0200 |
commit | a4aa2f296b1c9f8b9eeb995f6818ce39b6b5a288 (patch) | |
tree | b26acdd406abf0ae459f17d941da3ff12080f075 /tests/auto/core | |
parent | d72fba3c60af5fd3aba43fd33630f334a5fb2327 (diff) | |
parent | 6a8cfd6e52ad340c80b5a8b862b713192cecf791 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9e9214906c5cda56d0bcc98678c77be69189699d
Diffstat (limited to 'tests/auto/core')
-rw-r--r-- | tests/auto/core/qentity/tst_qentity.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp index d7847342b..04f695953 100644 --- a/tests/auto/core/qentity/tst_qentity.cpp +++ b/tests/auto/core/qentity/tst_qentity.cpp @@ -73,7 +73,7 @@ class MyQComponent : public Qt3DCore::QComponent { Q_OBJECT public: - explicit MyQComponent(Qt3DCore::QNode *parent = 0) + explicit MyQComponent(Qt3DCore::QNode *parent = nullptr) : QComponent(parent) {} }; @@ -90,7 +90,7 @@ public: class MyEntity : public Qt3DCore::QEntity { public: - explicit MyEntity(Qt3DCore::QNode *parent = 0) + explicit MyEntity(Qt3DCore::QNode *parent = nullptr) : QEntity(parent) {} }; @@ -622,6 +622,8 @@ void tst_Entity::checkCloning_data() Qt3DCore::QEntity *grandChild = new MyEntity(entityWithNestedChildren); QVector<QNodeId> childIds = {child->id(), grandChild->id()}; QTest::newRow("entityWithNestedChildren") << entityWithNestedChildren << childIds << 4; + + Q_UNUSED(dummy); } } |