From ade888860334d207f5f070b0bc9c4c98deaf3862 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Sun, 29 Apr 2012 00:11:28 -0700 Subject: 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 --- tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/tools/qeasingcurve') diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp index 40e3cd08b6..487007e4cf 100644 --- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp +++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp @@ -526,7 +526,7 @@ void tst_QEasingCurve::properties() obj.setEasing(inOutBack); - QEasingCurve easing = qVariantValue(obj.property("easing")); + QEasingCurve easing = qvariant_cast(obj.property("easing")); QCOMPARE(easing.type(), QEasingCurve::InOutBack); QCOMPARE(easing.overshoot(), overshoot); QCOMPARE(easing.amplitude(), amplitude); @@ -538,9 +538,9 @@ void tst_QEasingCurve::properties() period = linear.period(); obj.setProperty("easing", - qVariantFromValue(QEasingCurve(QEasingCurve::Linear))); + QVariant::fromValue(QEasingCurve(QEasingCurve::Linear))); - easing = qVariantValue(obj.property("easing")); + easing = qvariant_cast(obj.property("easing")); QCOMPARE(easing.type(), QEasingCurve::Linear); QCOMPARE(easing.overshoot(), overshoot); QCOMPARE(easing.amplitude(), amplitude); -- cgit v1.2.3