diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 23:04:48 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 23:04:48 (GMT) |
commit | 5fd91a33ddfb9d8419eb7b3592087e9b5d15df58 (patch) | |
tree | 797765595a505cd6c3608e2a92b3a38a12e8f4d5 /tests/auto | |
parent | 8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (diff) | |
parent | 5746327c5566223f01f10f62baf8d7c3e47a6c9f (diff) | |
download | Qt-5fd91a33ddfb9d8419eb7b3592087e9b5d15df58.zip Qt-5fd91a33ddfb9d8419eb7b3592087e9b5d15df58.tar.gz Qt-5fd91a33ddfb9d8419eb7b3592087e9b5d15df58.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed: Declared properties cannot be assigned in declaration
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index e2cf5ca..0f11498 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -1065,7 +1065,6 @@ void tst_qdeclarativelanguage::defaultPropertyListOrder() void tst_qdeclarativelanguage::declaredPropertyValues() { QDeclarativeComponent component(&engine, TEST_FILE("declaredPropertyValues.qml")); - QEXPECT_FAIL("", "QTBUG-7860", Abort); VERIFY_ERRORS(0); } |