summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials
diff options
context:
space:
mode:
Diffstat (limited to 'examples/declarative/tutorials')
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml10
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml7
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">