summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-01-11 06:48:30 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-01-11 06:48:30 (GMT)
commitb90d963ca4a021796188a8d1629e600c47a90fba (patch)
treea7308f589710be15be8bf85e44320301e90a2acd /tests
parent06775ea8c44ac2a6cbcfc2e3fa912cccfd8db90c (diff)
parentac8d5043426655e615731ff05ff7631e8ca1c8a2 (diff)
downloadQt-b90d963ca4a021796188a8d1629e600c47a90fba.zip
Qt-b90d963ca4a021796188a8d1629e600c47a90fba.tar.gz
Qt-b90d963ca4a021796188a8d1629e600c47a90fba.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index bf95a54..8fa9576 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -706,9 +706,16 @@ void tst_qmllanguage::valueTypes()
{
QmlComponent component(&engine, TEST_FILE("valueTypes.qml"));
VERIFY_ERRORS(0);
+
+ QString message = QLatin1String("QML MyTypeObject (") + component.url().toString() +
+ QLatin1String(":2:1) Binding loop detected for property \"rectProperty.width\"");
+ QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+ QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+
MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
QVERIFY(object != 0);
+
QCOMPARE(object->rectProperty(), QRect(10, 11, 12, 13));
QCOMPARE(object->rectProperty2(), QRect(10, 11, 12, 13));
QCOMPARE(object->intProperty(), 10);