diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
| commit | 539206ac11fc341db6e29ebdc3c838848f822bc5 (patch) | |
| tree | a7e1a7f79bf2a1140446f06a1aed01786be13f18 /examples | |
| parent | 4c0abed6af10a2722ad3f1fd352caa3fe673468e (diff) | |
| parent | ae7a3485c0e6748361789491af33ee7b7fe093bc (diff) | |
| download | Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.zip Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.gz Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml | 12 | ||||
| -rw-r--r-- | examples/declarative/webview/newwindows.qml | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml index ec115fe..7bcdf50 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml @@ -16,18 +16,18 @@ Rectangle { } } ] - ComponentInstance { - component: redRectangle + Loader { + sourceComponent: redRectangle anchors.right: parent.right anchors.top: parent.top } - ComponentInstance { - component: redRectangle + Loader { + sourceComponent: redRectangle anchors.left: parent.left anchors.top: parent.top } - ComponentInstance { - component: redRectangle + Loader { + sourceComponent: redRectangle anchors.left: parent.left anchors.bottom: parent.bottom } diff --git a/examples/declarative/webview/newwindows.qml b/examples/declarative/webview/newwindows.qml index 9ff902e2..57cbf4e 100644 --- a/examples/declarative/webview/newwindows.qml +++ b/examples/declarative/webview/newwindows.qml @@ -24,5 +24,5 @@ Row { } ] width: 500 - ComponentInstance { component: WebViewPage } + Loader { sourceComponent: WebViewPage } } |