diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 07:44:27 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 07:44:27 (GMT) |
| commit | 1383f287137c50c7e58e7f9395f7a9ffd9441852 (patch) | |
| tree | 25f8a9960cb58132bbf42af688cc44b1569809b1 /tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | |
| parent | 238ed995be8f32e815ffb6883144d0547355a8eb (diff) | |
| parent | 89b4f1eb2bae2f09a9db8094db91a7dabdcdb0a3 (diff) | |
| download | Qt-1383f287137c50c7e58e7f9395f7a9ffd9441852.zip Qt-1383f287137c50c7e58e7f9395f7a9ffd9441852.tar.gz Qt-1383f287137c50c7e58e7f9395f7a9ffd9441852.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 6d39be2..8c9290f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -1104,7 +1104,7 @@ void tst_qdeclarativeecmascript::exceptionClearsOnReeval() QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml")); QString url = component.url().toString(); - QString warning = url + ":4: TypeError: Result of expression 'objectProperty.objectProperty' [undefined] is not an object."; + QString warning = url + ":4: TypeError: Result of expression 'objectProperty' [null] is not an object."; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); |