diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-05-14 13:29:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 09:16:41 +0200 |
| commit | e1c26307c25173d4f44592dcd01d22eafda76f23 (patch) | |
| tree | 48876990cdc392741c4bb81c9a64b263ed93e343 /tests/auto/qml/qjsonbinding | |
| parent | e0eec47cac3f9f06613011dd70db74b7cd7d61ef (diff) | |
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 <kent.hansen@nokia.com>
Diffstat (limited to 'tests/auto/qml/qjsonbinding')
| -rw-r--r-- | tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
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")); } |