diff options
author | Sami Merila <sami.merila@nokia.com> | 2010-09-01 08:19:57 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2010-09-01 08:19:57 (GMT) |
commit | 22fe21e22cf3a8aedea57e419034ed3245b10c0d (patch) | |
tree | d846ea9295f357204019f9b56286a5903da04819 /tests/auto/declarative/qdeclarativeecmascript/data | |
parent | 1ec0155c191e2818f56815ee4ddbf5d8982f1267 (diff) | |
parent | 7b6028276cf5de1ffd5ab8d6dede7cca12e906fd (diff) | |
download | Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.zip Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.tar.gz Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data')
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml | 14 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml | 19 |
2 files changed, 33 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml new file mode 100644 index 0000000..6d23e5f7 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml @@ -0,0 +1,14 @@ +import Qt 4.7 + +QtObject { + id: root + property bool test: false + + Component.onCompleted: { + try { + root.deleteLater() + } catch(e) { + test = true; + } + } +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml new file mode 100644 index 0000000..024d82e --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml @@ -0,0 +1,19 @@ +import Qt.test 1.0 +import Qt 4.7 + +MyQmlObject { + id: root + + property bool readOk: false; + property bool writeOk: false + + Component.onCompleted: { + readOk = (root.nonscriptable == undefined); + + try { + root.nonscriptable = 10 + } catch (e) { + writeOk = true; + } + } +} |