diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2018-06-20 10:15:14 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2018-06-20 13:19:13 +0000 |
| commit | be0cd9c0b19f1f1b72d2bc165e948d162b998f88 (patch) | |
| tree | 9f5d2c1d94f75850c4e4667f753714be763f095a /tests | |
| parent | 7b2d0fdba63c0aca5e37f59706455618787a44eb (diff) | |
Fix compile warnings
Change-Id: I71f1352de28383d5105c7ff887191265b509d191
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/render/uniform/tst_uniform.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp b/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp index 6a1c8da8c..78dff8b64 100644 --- a/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp +++ b/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp @@ -125,7 +125,7 @@ private Q_SLOTS: QCOMPARE(creationChangeData->type(), Qt3DAnimation::QChannelMappingCreatedChangeBase::CallbackMapping); QCOMPARE(mapping.channelName(), data.channelName); QCOMPARE(mapping.callback(), data.callback); - QCOMPARE(QVariant::Vector3D, data.type); + QCOMPARE(int(QVariant::Vector3D), data.type); } // WHEN @@ -194,7 +194,7 @@ private Q_SLOTS: auto change = arbiter.events.at(0).staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "type"); QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); - QCOMPARE(change->value().toInt(), QVariant::Vector3D); + QCOMPARE(change->value().toInt(), int(QVariant::Vector3D)); change = arbiter.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "callback"); diff --git a/tests/auto/render/uniform/tst_uniform.cpp b/tests/auto/render/uniform/tst_uniform.cpp index c0e33f49b..5f946afa3 100644 --- a/tests/auto/render/uniform/tst_uniform.cpp +++ b/tests/auto/render/uniform/tst_uniform.cpp @@ -149,7 +149,7 @@ private Q_SLOTS: UniformValue v(nodeId); // THEN - QCOMPARE(v.byteSize(), sizeof(Qt3DCore::QNodeId)); + QCOMPARE(uint(v.byteSize()), sizeof(Qt3DCore::QNodeId)); QCOMPARE(v.constData<Qt3DCore::QNodeId>()[0], nodeId); } } |