diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-13 08:24:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-13 08:54:32 +0200 |
| commit | 4bdde1128f29a5545f52d6fc5fd33f1487625206 (patch) | |
| tree | 80ba79c04e4a8929df9144ad95c97048a4d399a1 /tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | |
| parent | d0b466371ee1d00c4477991ed728f73be38ec16e (diff) | |
Fix exception type when trying to assign to read-only QObject properties
[[Put]] throws a type error, and so should the put operation on a QObject
Change-Id: I8fad91f3969c1889381d67d8d0ff751a91f8239e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index cdf46c48bc..d77c775557 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -1750,7 +1750,7 @@ void tst_qqmlecmascript::scriptErrors() QString warning4 = url + ":13: ReferenceError: a is not defined"; QString warning5 = url + ":11: ReferenceError: a is not defined"; QString warning6 = url + ":10:21: Unable to assign [undefined] to int"; - QString warning7 = url + ":15: Error: Cannot assign to read-only property \"trueProperty\""; + QString warning7 = url + ":15: TypeError: Cannot assign to read-only property \"trueProperty\""; QString warning8 = url + ":16: Error: Cannot assign to non-existent property \"fakeProperty\""; QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData()); @@ -3619,7 +3619,7 @@ void tst_qqmlecmascript::singletonType_data() << testFileUrl("singletontype/qobjectSingletonTypeWriting.qml") << QString() << (QStringList() << - QString(testFileUrl("singletontype/qobjectSingletonTypeWriting.qml").toString() + QLatin1String(":15: Error: Cannot assign to read-only property \"qobjectTestProperty\""))) + QString(testFileUrl("singletontype/qobjectSingletonTypeWriting.qml").toString() + QLatin1String(":15: TypeError: Cannot assign to read-only property \"qobjectTestProperty\""))) << (QStringList() << "readOnlyProperty" << "writableProperty" << "writableFinalProperty") << (QVariantList() << 20 << 50 << 10) << (QStringList() << "firstProperty" << "secondProperty") |