summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
diff options
context:
space:
mode:
authorDebao Zhang <dbzhang800@gmail.com>2012-04-29 00:11:28 -0700
committerQt by Nokia <qt-info@nokia.com>2012-05-02 08:30:59 +0200
commitade888860334d207f5f070b0bc9c4c98deaf3862 (patch)
tree133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
parent6102ab8d646d76a68bb460885394501e90b4fd1f (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/qmatrixnxn/tst_qmatrixnxn.cpp')
-rw-r--r--tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
index 698470ac60..c89d10a543 100644
--- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -3358,13 +3358,13 @@ void tst_QMatrixNxN::properties()
QMatrix4x4 m1(uniqueValues4);
obj.setMatrix(m1);
- QMatrix4x4 m2 = qVariantValue<QMatrix4x4>(obj.property("matrix"));
+ QMatrix4x4 m2 = qvariant_cast<QMatrix4x4>(obj.property("matrix"));
QVERIFY(isSame(m2, uniqueValues4));
QMatrix4x4 m3(transposedValues4);
- obj.setProperty("matrix", qVariantFromValue(m3));
+ obj.setProperty("matrix", QVariant::fromValue(m3));
- m2 = qVariantValue<QMatrix4x4>(obj.property("matrix"));
+ m2 = qvariant_cast<QMatrix4x4>(obj.property("matrix"));
QVERIFY(isSame(m2, transposedValues4));
}