Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

5 files changed, 18 insertions, 18 deletions

diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
index 4fa0d9f..98d48a8 100644
--- a/examples/declarative/dynamic/qml/itemCreation.js
+++ b/examples/declarative/dynamic/qml/itemCreation.js
@@ -32,7 +32,7 @@ function loadComponent() {
         createItem();
 
     itemComponent = Qt.createComponent(itemButton.file);
-    //print(itemButton.file)
+    //console.log(itemButton.file)
     if(itemComponent.isLoading){
         component.statusChanged.connect(finishCreation);
     }else{//Depending on the content, it can be ready or error immediately
@@ -51,8 +51,8 @@ function createItem() {
         draggedItem.z = 4;//On top
     } else if (itemComponent.isError) {
         draggedItem = null;
-        print("error creating component");
-        print(component.errorsString());
+        console.log("error creating component");
+        console.log(component.errorsString());
     }
 }
 
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/declarative/tutorials/samegame/samegame2/samegame.js
index 81da31b..e5c790d 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.js
@@ -43,8 +43,8 @@ function createBlock(column, row) {
     if (component.isReady) {
         var dynamicObject = component.createObject();
         if (dynamicObject == null) {
-            print("error creating block");
-            print(component.errorsString());
+            console.log("error creating block");
+            console.log(component.errorsString());
             return false;
         }
         dynamicObject.parent = background;
@@ -54,8 +54,8 @@ function createBlock(column, row) {
         dynamicObject.height = blockSize;
         board[index(column, row)] = dynamicObject;
     } else {
-        print("error loading block component");
-        print(component.errorsString());
+        console.log("error loading block component");
+        console.log(component.errorsString());
         return false;
     }
     return true;
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js
index eaf47d9..da0f76e 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js
@@ -40,8 +40,8 @@ function createBlock(column, row) {
     if (component.isReady) {
         var dynamicObject = component.createObject();
         if (dynamicObject == null) {
-            print("error creating block");
-            print(component.errorsString());
+            console.log("error creating block");
+            console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
@@ -52,8 +52,8 @@ function createBlock(column, row) {
         dynamicObject.height = gameCanvas.blockSize;
         board[index(column, row)] = dynamicObject;
     } else {
-        print("error loading block component");
-        print(component.errorsString());
+        console.log("error loading block component");
+        console.log(component.errorsString());
         return false;
     }
     return true;
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index c527f66..1454f0b 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -51,8 +51,8 @@ function createBlock(column, row) {
     if (component.isReady) {
         var dynamicObject = component.createObject();
         if (dynamicObject == null) {
-            print("error creating block");
-            print(component.errorsString());
+            console.log("error creating block");
+            console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
@@ -65,8 +65,8 @@ function createBlock(column, row) {
         dynamicObject.spawned = true;
         board[index(column, row)] = dynamicObject;
     } else {
-        print("error loading block component");
-        print(component.errorsString());
+        console.log("error loading block component");
+        console.log(component.errorsString());
         return false;
     }
     return true;
diff --git a/examples/declarative/workerscript/workerscript.qml b/examples/declarative/workerscript/workerscript.qml
index 6c6253b..2294a81 100644
--- a/examples/declarative/workerscript/workerscript.qml
+++ b/examples/declarative/workerscript/workerscript.qml
@@ -8,9 +8,9 @@ Rectangle {
         source: "workerscript.js"
 
         onMessage: {
-            print("Moved " + messageObject.xmove + " along the X axis.");
-            print("Moved " + messageObject.ymove + " along the Y axis.");
-            print("Moved " + messageObject.move + " pixels.");
+            console.log("Moved " + messageObject.xmove + " along the X axis.");
+            console.log("Moved " + messageObject.ymove + " along the Y axis.");
+            console.log("Moved " + messageObject.move + " pixels.");
         }
     }