9 files changed, 12 insertions, 10 deletions

diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/RemoveButton.qml
index a8ac7fe..a8ac7fe 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/RemoveButton.qml
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml
index 162452f..9508018 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml
@@ -21,7 +21,7 @@ Item {
         anchors.verticalCenter: parent.verticalCenter
         font.bold: true
         color: "black"
-        text: 123123
+        text: "123123"
     }
     Image {
         source: "../../shared/pics/phone.png"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml
index cf50fb0..e50dcc5 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml
@@ -24,7 +24,7 @@ Item {
         anchors.verticalCenter: parent.verticalCenter
         font.bold: true
         color: "black"
-        text: 123123
+        text: "123123"
     }
     Image {
         source: "../../shared/pics/phone.png"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml
index 2e1a488..ce6a289 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml
@@ -23,7 +23,7 @@ Item {
         anchors.verticalCenter: parent.verticalCenter
         font.bold: true
         color: "black"
-        text: 123123
+        text: "123123"
     }
     Image {
         source: "../../shared/pics/phone.png"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml
index 3516cee..f253763 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml
@@ -16,9 +16,10 @@ Item {
 
     Column {
         id: layout
-        anchors.fill: parent
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
         spacing: 5
-        margin: 5
         ContactField {
             id: labelField
             anchors.left: layout.left
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml
index 83988ab..db85d2a 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml
@@ -19,9 +19,10 @@ Item {
 
     Column {
         id: layout
-        anchors.fill: parent
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
         spacing: 5
-        margin: 5
         ContactField {
             id: labelField
             anchors.left: layout.left
diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml
index a7764ed..cd14a08 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml
@@ -5,7 +5,7 @@ Rectangle {
     width: layout.width
     height: layout.height
     color: "white"
-    Bind {
+    Binding {
         id: currentItem
         value: true
     }
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml
index d00bf05..58a542b 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml
@@ -17,7 +17,6 @@ Item {
         id: layout
         anchors.fill: parent
         spacing: 5
-        margin: 5
         ContactField {
             id: labelField
             anchors.left: layout.left
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index b2884dd..e185536 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -302,7 +302,7 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     setLayout(layout);
     if (mb)
         layout->addWidget(mb);
-    layout->addWidget(canvas);
+    layout->addWidget(canvas, 0, Qt::AlignLeft);
 
     setupProxy();
     canvas->engine()->networkAccessManager()->setCookieJar(new PersistentCookieJar(this));
@@ -651,6 +651,7 @@ void QmlViewer::openQml(const QString& fileName)
     if (!skin) {
         canvas->updateGeometry();
         canvas->resize(canvas->sizeHint());
+        canvas->updateGeometry();
         resize(sizeHint());
     } else {
         if (scaleSkin)