diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-04-29 00:11:28 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 08:30:59 +0200 |
| commit | ade888860334d207f5f070b0bc9c4c98deaf3862 (patch) | |
| tree | 133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp | |
| parent | 6102ab8d646d76a68bb460885394501e90b4fd1f (diff) | |
Don't use obsolete qVariantValue, qVariantCanConvert, etc.
qVariantValue and qVariantCanConvert are Compatibility members, while in
Qt4.8 they are marked as Qt 3 Support Members.
qVariantFromValue and qVariantSetValue are Obsolete members.
Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp')
| -rw-r--r-- | tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp index 1690afcac4..a4e1f940fc 100644 --- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp +++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp @@ -855,16 +855,16 @@ void tst_QQuaternion::properties() obj.setQuaternion(QQuaternion(6.0f, 7.0f, 8.0f, 9.0f)); - QQuaternion q = qVariantValue<QQuaternion>(obj.property("quaternion")); + QQuaternion q = qvariant_cast<QQuaternion>(obj.property("quaternion")); QCOMPARE(q.scalar(), (qreal)6.0f); QCOMPARE(q.x(), (qreal)7.0f); QCOMPARE(q.y(), (qreal)8.0f); QCOMPARE(q.z(), (qreal)9.0f); obj.setProperty("quaternion", - qVariantFromValue(QQuaternion(-6.0f, -7.0f, -8.0f, -9.0f))); + QVariant::fromValue(QQuaternion(-6.0f, -7.0f, -8.0f, -9.0f))); - q = qVariantValue<QQuaternion>(obj.property("quaternion")); + q = qvariant_cast<QQuaternion>(obj.property("quaternion")); QCOMPARE(q.scalar(), (qreal)-6.0f); QCOMPARE(q.x(), (qreal)-7.0f); QCOMPARE(q.y(), (qreal)-8.0f); |