Fix issues for release 1.0

Change-Id: I7e140534523b95fc32c08445d432e72773452f04
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>

7 files changed, 6 insertions, 17 deletions

diff --git a/README b/README
index 18d385988..46f9b5955 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ Building Qt3D
 ==================
 
 Check the building instructions in doc/src/qt3d-building.qdoc also available
-online at: http://doc.qt.nokia.com/qt-quick3d-snapshot/qt3d-building.html
+online at: http://doc-snapshot.qt-project.org/qt3d-1.0/qt3d-building.html
 
 
 Whats in Qt3D
@@ -36,6 +36,8 @@ doc/
     Documentation.
 devices/symbian/
     Symbian deployment file
+qtc_harmattan
+    Harmattan (N9) support
 
 
 Documentation
diff --git a/demos/quick3d/robo_bounce/qml/robobounce.qml b/demos/quick3d/robo_bounce/qml/robobounce.qml
index a322691f1..dc20d1a2b 100644
--- a/demos/quick3d/robo_bounce/qml/robobounce.qml
+++ b/demos/quick3d/robo_bounce/qml/robobounce.qml
@@ -57,7 +57,6 @@ Image {
     Keys.onSpacePressed: {
         heartbeat.restart();
         qt3dButton.bounce = true;
-        console.log("Hide Calc")
         if (calc.state=="hidden") {
             calc.state="shown"
 
@@ -66,17 +65,14 @@ Image {
         };
     }
     Keys.onLeftPressed: {
-        console.log("Rotate Key Pressed");
         heartbeat.restart();
         room.spinning = true;
     }
     Keys.onRightPressed: {
-        console.log("Box Drop Key pressed");
         heartbeat.restart();
         smallCube.fallingCubeAnimation=true;
     }
     Keys.onUpPressed: {
-        console.log("Info Key Pressed");
         heartbeat.restart();
         roboInfo.showVisible=true
     }
@@ -148,7 +144,6 @@ Image {
         repeat: true
         onTriggered: {
             qt3dButton.bounce = true;
-            console.log("Hide Calc")
             if (calc.state=="hidden") {
                 calc.state="shown"
             } else {
@@ -196,7 +191,6 @@ Image {
                         from: "*"
                         to: "panelUp"
                         SequentialAnimation {
-                            onStarted: { console.log("Panel Up"); }
                             NumberAnimation {target: buttonPanel; property: opacity; to: 0; duration: 2000;}
                             PropertyAction{target: buttonPanel; property: "visible"; value: false}
                         }
@@ -220,7 +214,6 @@ Image {
                     x: buttonBox1.x+10
                     y: buttonBox1.y+10
                     onPressed: {
-                        console.log("Rotate Pressed");
                         room.spinning = true;
                         heartbeat.restart();
                     }
@@ -230,7 +223,6 @@ Image {
                     x: buttonBox1.x+60
                     y: buttonBox1.y+10
                     onPressed: {
-                        console.log("Box button pressed");
                         smallCube.fallingCubeAnimation=true;
                         heartbeat.restart();
                     }
@@ -240,7 +232,6 @@ Image {
                     x: buttonBox1.x+110
                     y: buttonBox1.y+10
                     onPressed: {
-                        console.log("Info Button Pressed");
                         roboInfo.showVisible=true
                         heartbeat.restart();
                     }
@@ -299,7 +290,6 @@ Image {
                     onClicked: {
                         heartbeat.restart();
                         qt3dButton.bounce = true;
-                        console.log("Hide Calc")
                         if (calc.state=="hidden") {
                             calc.state="shown"
                         } else {
@@ -351,7 +341,6 @@ Image {
                         from: "*"
                         to: "threedView"
                         SequentialAnimation {
-                            onStarted: {console.log("start")}
                             SequentialAnimation {
                                 NumberAnimation { target: theCamera; property: "fieldOfView"; to: 20; duration: 1000; easing.type: "InOutQuad" }
                                 ParallelAnimation {
@@ -451,7 +440,6 @@ Image {
 
                         onClicked: {
                             heartbeat.restart();
-                            console.log("Small cube clicked");
                             smallCube.fallingCubeAnimation=true;
                         }
 
@@ -525,7 +513,6 @@ Image {
                         scale: 10.0
                         onClicked: {
                             heartbeat.restart();
-                            console.log("Big cube clicked");
                             room.spinning = true;
                         }
                     }
@@ -566,7 +553,6 @@ Image {
 
                         onClicked: {
                             heartbeat.restart();
-                            console.log("robot has been clicked")
                             roboInfo.showVisible=true
                         }
 
diff --git a/examples/quick3d/animations/animations.qrc b/examples/quick3d/animations/animations.qrc
index 0336aaa93..94a7b6766 100644
--- a/examples/quick3d/animations/animations.qrc
+++ b/examples/quick3d/animations/animations.qrc
@@ -3,5 +3,7 @@
         <file>qml/cube_rotated.dae</file>
         <file>qml/animations.qml</file>
         <file>qml/stonewal.jpg</file>
+        <file>qml/stonewal.png</file>
+        <file>qml/waves.bmp</file>
     </qresource>
 </RCC>
diff --git a/examples/quick3d/animations/qml/stonewal.png b/examples/quick3d/animations/qml/stonewal.png
new file mode 100644
index 000000000..87a54cff1
--- /dev/null
+++ b/examples/quick3d/animations/qml/stonewal.png
diff --git a/examples/quick3d/animations/qml/waves.bmp b/examples/quick3d/animations/qml/waves.bmp
new file mode 100755
index 000000000..dd95b69d5
--- /dev/null
+++ b/examples/quick3d/animations/qml/waves.bmp
diff --git a/examples/quick3d/modelview3d/qml/modelview3d.qml b/examples/quick3d/modelview3d/qml/modelview3d.qml
index 57103b8f4..6458a85a7 100644
--- a/examples/quick3d/modelview3d/qml/modelview3d.qml
+++ b/examples/quick3d/modelview3d/qml/modelview3d.qml
@@ -141,7 +141,7 @@ Rectangle {
             // Component.onCompleted can be a useful place to do
             // initialization, like hooking up signals and slots.
             Component.onCompleted: {
-                console.log("Cube Completed");
+                // console.log("Cube Completed");
             }
         }
     }
diff --git a/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml b/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml
index 68456e4fa..5822b9602 100644
--- a/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml
+++ b/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml
@@ -44,7 +44,6 @@ import Qt3D.Shapes 1.0
 
 Viewport {
     width: 800; height: 600
-    showSceneGraph: true
 
     //! [0]
     SphereMesh {