diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-29 10:18:20 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-29 10:46:46 (GMT) |
commit | a4d208f1831ecba1d51d3afe9a9e9e21faf8b3cf (patch) | |
tree | 58a84c8617b1ec8b78805389f010ad378c0969f0 | |
parent | ca3f5521e1d3ada541739d6013d8c6fb795244a9 (diff) | |
download | Qt-a4d208f1831ecba1d51d3afe9a9e9e21faf8b3cf.zip Qt-a4d208f1831ecba1d51d3afe9a9e9e21faf8b3cf.tar.gz Qt-a4d208f1831ecba1d51d3afe9a9e9e21faf8b3cf.tar.bz2 |
Update autotest a little
variant property was removed, and data property was altered, without
updating this autotest. However the remaining failure for date appears
to be genuine
-rw-r--r-- | tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp index 16efba9..c41855d 100644 --- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp +++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp @@ -451,7 +451,6 @@ void tst_qdeclarativedom::loadDynamicProperty() " property color g\n" " property date h\n" " property var i\n" - " property variant j\n" " property QtObject k\n" "}"; @@ -461,7 +460,7 @@ void tst_qdeclarativedom::loadDynamicProperty() QDeclarativeDomObject rootObject = document.rootObject(); QVERIFY(rootObject.isValid()); - QCOMPARE(rootObject.dynamicProperties().count(), 11); + QCOMPARE(rootObject.dynamicProperties().count(), 10); #define DP_TEST(index, name, type, test_position, test_length, propTypeName) \ { \ @@ -483,9 +482,8 @@ void tst_qdeclarativedom::loadDynamicProperty() DP_TEST(4, e, QVariant::String, 106, 17, "string"); DP_TEST(5, f, QVariant::Url, 128, 14, "url"); DP_TEST(6, g, QVariant::Color, 147, 16, "color"); - DP_TEST(7, h, QVariant::Date, 168, 15, "date"); + DP_TEST(7, h, QVariant::DateTime, 168, 15, "date"); DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 14, "var"); - DP_TEST(9, j, qMetaTypeId<QVariant>(), 207, 18, "variant"); DP_TEST(10, k, -1, 230, 19, "QtObject"); } |