From e1c26307c25173d4f44592dcd01d22eafda76f23 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Mon, 14 May 2012 13:29:47 +1000 Subject: Revert "Allow function assignment to cause binding for non-var props" This reverts commit 92b1f9981d225ecee28da1f0a88fb3046000cb5e. Conflicts: src/qml/qml/v8/qv8qobjectwrapper.cpp Also remove XPASS tests from qjsonbinding Change-Id: Ibc9da28d5f0bdffbf62e7e20f12bb55ff36ae271 Reviewed-by: Kent Hansen --- tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/qml/qjsonbinding') diff --git a/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp b/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp index 09b256288a..2900b5cfe3 100644 --- a/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp +++ b/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp @@ -412,9 +412,6 @@ void tst_qjsonbinding::writeProperty_incompatibleType() QJSValue ret = eng.evaluate(QString::fromLatin1("obj.%0 = %1") .arg(property).arg(expression)); - QEXPECT_FAIL("value=function", "See 'XXX TODO: uncomment the following lines' in qv8qobjectwrapper.cpp", Abort); - QEXPECT_FAIL("object=function", "See 'XXX TODO: uncomment the following lines' in qv8qobjectwrapper.cpp", Abort); - QEXPECT_FAIL("array=function", "See 'XXX TODO: uncomment the following lines' in qv8qobjectwrapper.cpp", Abort); QVERIFY(ret.isError()); QVERIFY(ret.toString().contains("Cannot assign")); } -- cgit v1.2.3