diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-28 05:01:48 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-28 05:01:48 (GMT) |
| commit | 07233ff591197c3d7eb206251c72352b85b7aa73 (patch) | |
| tree | 529609a48fd162e1b0382cbac8d48403da72a0e3 /examples | |
| parent | a9b976c3c68e246f1d6ab83d02715ab81fb4dd6a (diff) | |
| download | Qt-07233ff591197c3d7eb206251c72352b85b7aa73.zip Qt-07233ff591197c3d7eb206251c72352b85b7aa73.tar.gz Qt-07233ff591197c3d7eb206251c72352b85b7aa73.tar.bz2 | |
Minor changes
A reformat, a couple of extra examples of loading types,
and a start on the contents of chapter 3.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml | 10 | ||||
| -rw-r--r-- | examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml index 98fdb86..6210308 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml @@ -1,9 +1,13 @@ <Rect id="page" width="{layout.width}" height="{layout.height}" color='white'> - <VerticalLayout id="layout" width="{contents.width}"> - <GroupBox contents="1/ContactField.qml" label="Loading Component"/> + <GridLayout id="layout" columns="2" rows="4" width="{contents.width}"> + <GroupBox contents="1/ContactField.qml" label="Loading: simple"/> + <GroupBox contents="1a/ContactField.qml" label="Loading: qml property"/> + <GroupBox contents="1b/ContactField.qml" label="Loading: added path"/> + <GroupBox contents="1c/ContactField.qml" label="Loading: added namespace"/> + <GroupBox contents="2/ContactField.qml" label="Using properties"/> <GroupBox contents="3/ContactField.qml" label="Defining signals"/> <GroupBox contents="3/Contact.qml" label="Multiple Items"/> <GroupBox contents="4/Contact.qml" label="Mouse Grabbing"/> - </VerticalLayout> + </GridLayout> </Rect> diff --git a/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml index 5f9abc7..e4cc1ce 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml @@ -6,8 +6,11 @@ <Property name="mouseGrabbed" value="false"/> </properties> <resources> - <SqlConnection id="contactDatabase" name="qmlConnection" driver="QSQLITE" databaseName="../../shared/contacts.sqlite"/> - <SqlQuery id="contactList" connection="{contactDatabase}"> + <SqlConnection id="contactDatabase" + name="qmlConnection" + driver="QSQLITE" databaseName="../../shared/contacts.sqlite"/> + <SqlQuery id="contactList" + connection="{contactDatabase}"> <query>SELECT recid, label, email, phone FROM contacts ORDER BY label, recid</query> </SqlQuery> <Component id="contactDelegate"> |