diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-31 23:44:10 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-31 23:44:10 (GMT) |
commit | 5c32e4129e331a95187b65c2ab16074d21d8d96f (patch) | |
tree | b86b6297b83f95860c7402b879e9b4691f485070 /tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | |
parent | 1bb04f8c0675449a851cf636680951bd0a142507 (diff) | |
parent | 5fd91a33ddfb9d8419eb7b3592087e9b5d15df58 (diff) | |
download | Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.zip Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.tar.gz Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp')
-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); } |