diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-06-25 17:35:55 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-06-25 17:35:55 (GMT) |
| commit | 8576e0f3652a8de05a5e59488b2611833944e6d6 (patch) | |
| tree | 31e2b9774dd5b8955094e3085b8e5f8a67a73526 /tests/auto/declarative/qdeclarativeqt/data | |
| parent | aaa7dd6200ce272ea1e3dd78148844200ac698a7 (diff) | |
| parent | 842ccf428d4cbed3c4ce1e0c894fbebcfd59ce0e (diff) | |
| download | Qt-8576e0f3652a8de05a5e59488b2611833944e6d6.zip Qt-8576e0f3652a8de05a5e59488b2611833944e6d6.tar.gz Qt-8576e0f3652a8de05a5e59488b2611833944e6d6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt/data')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js index c165e29..30499e9 100644 --- a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js +++ b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js @@ -5,3 +5,7 @@ function loadComponent() { return component.status; } +function createComponent() { + var component = Qt.createComponent("createComponentData.qml"); + return component.createObject(null); +} diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml index aae7a91..33203c7 100644 --- a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml +++ b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml @@ -3,8 +3,10 @@ import "createComponent_lib.js" as Test Item { property int status: Component.Null + property int readValue: 0 Component.onCompleted: { status = Test.loadComponent() + readValue = Test.createComponent().test; } } |