diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-30 05:24:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-30 05:24:51 (GMT) |
| commit | 46eec6d54bad7a686b3dd5cd6e4aa8577d38740d (patch) | |
| tree | e4c828d1d1456b3fafe74a339562263b3f2c156d /examples/declarative/dynamic/dynamic.qml | |
| parent | d85d7addc5084ee7d5de31dec562437f9c31c35d (diff) | |
| parent | d788c0127b86d8245aa0a8e2472562f444d98ee9 (diff) | |
| download | Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.zip Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.tar.gz Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcomponentjs.cpp
src/declarative/qml/qmlcomponentjs_p.h
src/declarative/qml/qmlcomponentjs_p_p.h
Diffstat (limited to 'examples/declarative/dynamic/dynamic.qml')
| -rw-r--r-- | examples/declarative/dynamic/dynamic.qml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml index ea4e0cd..0166b4c 100644 --- a/examples/declarative/dynamic/dynamic.qml +++ b/examples/declarative/dynamic/dynamic.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import "qml" Item { id: window @@ -71,26 +72,26 @@ Item { PaletteItem{ anchors.verticalCenter: parent.verticalCenter file: "Sun.qml"; - image: "images/sun.png" + image: "../images/sun.png" } PaletteItem{ file: "GenericItem.qml" - image: "images/moon.png" + image: "../images/moon.png" } PaletteItem{ anchors.verticalCenter: parent.verticalCenter file: "PerspectiveItem.qml" - image: "images/tree_s.png" + image: "../images/tree_s.png" } PaletteItem{ anchors.verticalCenter: parent.verticalCenter file: "PerspectiveItem.qml" - image: "images/rabbit_brown.png" + image: "../images/rabbit_brown.png" } PaletteItem{ anchors.verticalCenter: parent.verticalCenter file: "PerspectiveItem.qml" - image: "images/rabbit_bw.png" + image: "../images/rabbit_bw.png" } } Text{ text: "Active Suns: " + activeSuns } @@ -108,7 +109,7 @@ Item { } Button { text: "Create" - onClicked: {var obj=createQmlObject(qmlText.text, window, 'CustomObject'); obj.parent=window;} + onClicked: createQmlObject(qmlText.text, window, 'CustomObject'); } } } |