Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 8 insertions, 1 deletions

diff --git a/examples/qt3d/controls/main.qml b/examples/qt3d/controls/main.qml
index 2b438ac20..5d1f9c02c 100644
--- a/examples/qt3d/controls/main.qml
+++ b/examples/qt3d/controls/main.qml
@@ -178,13 +178,20 @@ Item {
         spacing: 5
 
         Text { text: "Camera"; font.bold: true }
-        Text { text: "View Center Z" }
+        Text { text: "View Ctr Z: " + watch.cameraZ.toFixed(2) }
         Slider {
             id: viewCenter_z
             Layout.fillWidth: true
             minimumValue: 4
             maximumValue: 12
             value: 7.5
+            onValueChanged: watch.setPositionZ(value)
+        }
+        Button {
+            id: viewAll
+            Layout.fillWidth: true
+            text: "View All"
+            onClicked: watch.viewLogo()
         }
     }