diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-06 12:33:28 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-06 12:33:28 (GMT) |
| commit | b3de9c2ee4c9f36a6133fc78109909c3ee6317fd (patch) | |
| tree | 3d0ca078d56246cb0f7f8626cc54d642f45bb641 /tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp | |
| parent | ca68786e62e0e645b692dc19a87b7dc3b2219ffd (diff) | |
| parent | 6892d7adf00d0481103a48a1ff89ad0be2a1143b (diff) | |
| download | Qt-b3de9c2ee4c9f36a6133fc78109909c3ee6317fd.zip Qt-b3de9c2ee4c9f36a6133fc78109909c3ee6317fd.tar.gz Qt-b3de9c2ee4c9f36a6133fc78109909c3ee6317fd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp index 5028ba1..dca5205 100644 --- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp +++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp @@ -480,7 +480,7 @@ void tst_qdeclarativedom::loadDynamicProperty() DP_TEST(0, a, QVariant::Int, 25, 14, "int"); DP_TEST(1, b, QVariant::Bool, 44, 15, "bool"); - DP_TEST(2, c, QVariant::Double, 64, 17, "double"); + DP_TEST(2, c, QMetaType::QReal, 64, 17, "double"); DP_TEST(3, d, QMetaType::QReal, 86, 15, "real"); DP_TEST(4, e, QVariant::String, 106, 17, "string"); DP_TEST(5, f, QVariant::Url, 128, 14, "url"); |