From e6c0633a9c386817017a97dac9e541a45f42fd7f Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Mon, 22 Aug 2011 13:15:52 +0200 Subject: Fix tst_qjsvalue::castToPointer test failure In order for casting the variant's data() to work, we need to get at the actual QVariant wrapped in the JS object; copying the variant caused a stale pointer to be returned. Task-number: QTBUG-21000 Change-Id: I1a32a70d5a043c94dbbd07ef2c8048e7df7fc7bf Reviewed-on: http://codereview.qt.nokia.com/3309 Reviewed-by: Qt Sanity Bot Reviewed-by: Simon Hausmann --- tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp index 4eef465ddd..24330c9f2e 100644 --- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp @@ -3705,11 +3705,7 @@ void tst_QJSValue::castToPointer() QJSValue v = eng.newVariant(int(123)); int *ip = qjsvalue_cast(v); QVERIFY(ip != 0); -#ifdef Q_WS_QPA - QEXPECT_FAIL("", "QTBUG-21000 fails", Abort); -#endif QCOMPARE(*ip, 123); - QEXPECT_FAIL("", "Pointer magic for variants is currently not supported by QJSEngine", Abort); *ip = 456; QCOMPARE(qjsvalue_cast(v), 456); -- cgit v1.2.3